From d9b394b06539917efde69ea0cacbe62a4de59ec2 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 29 Jun 2021 10:23:28 +0200 Subject: [PATCH 1/4] .matrix.yml: add openSUSE Leap 15.3 --- .matrix.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.matrix.yml b/.matrix.yml index 8107f366b7b..983fc507bed 100644 --- a/.matrix.yml +++ b/.matrix.yml @@ -31,6 +31,16 @@ OS: - python-bareos openSUSE: + "Leap_15.3": + TYPE: rpm + IMAGE: opensuse-leap153 + ARCH: + - x86_64 + PROJECTPACKAGES: + x86_64: + - bareos + - python-bareos + "Leap_15.2": TYPE: rpm IMAGE: opensuse-leap152 From 8ec8d32107a24095c584a35056c5d993ce3b6bfc Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 29 Jun 2021 13:36:20 +0200 Subject: [PATCH 2/4] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77de3506986..d1a380cca2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https: - add "copy button" to code snippets in documentation for easy copying [PR #802] - added multicolumn prompt selection for selection of more than 20 items [PR #731] - add script devtools/dist-tarball.sh to produce the same tarball from a cloned repo everywhere [PR #861] +- packages: Build also for openSUSE Leap 15.3 [PR #870] ### Changed - core: systemd service: change daemon type from forking to simple and start daemons in foreground [PR #824] From 6b39b656f0385578def07d588650ae2e6b9e22cc Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 29 Jun 2021 16:16:58 +0200 Subject: [PATCH 3/4] pkglists: add openSUSE_Leap_15.3.x86_64 --- docs/pkglists/openSUSE_Leap_15.3.x86_64 | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 docs/pkglists/openSUSE_Leap_15.3.x86_64 diff --git a/docs/pkglists/openSUSE_Leap_15.3.x86_64 b/docs/pkglists/openSUSE_Leap_15.3.x86_64 new file mode 100644 index 00000000000..b5d3ab4c947 --- /dev/null +++ b/docs/pkglists/openSUSE_Leap_15.3.x86_64 @@ -0,0 +1,61 @@ +debug/x86_64/bareos-bconsole-debuginfo +debug/x86_64/bareos-common-debuginfo +debug/x86_64/bareos-database-common-debuginfo +debug/x86_64/bareos-database-postgresql-debuginfo +debug/x86_64/bareos-database-sqlite3-debuginfo +debug/x86_64/bareos-database-tools-debuginfo +debug/x86_64/bareos-debuginfo +debug/x86_64/bareos-debugsource +debug/x86_64/bareos-director-debuginfo +debug/x86_64/bareos-director-python2-plugin-debuginfo +debug/x86_64/bareos-director-python3-plugin-debuginfo +debug/x86_64/bareos-filedaemon-ceph-plugin-debuginfo +debug/x86_64/bareos-filedaemon-debuginfo +debug/x86_64/bareos-filedaemon-python2-plugin-debuginfo +debug/x86_64/bareos-filedaemon-python3-plugin-debuginfo +debug/x86_64/bareos-storage-ceph-debuginfo +debug/x86_64/bareos-storage-debuginfo +debug/x86_64/bareos-storage-droplet-debuginfo +debug/x86_64/bareos-storage-fifo-debuginfo +debug/x86_64/bareos-storage-python2-plugin-debuginfo +debug/x86_64/bareos-storage-python3-plugin-debuginfo +debug/x86_64/bareos-storage-tape-debuginfo +debug/x86_64/bareos-tools-debuginfo +debug/x86_64/bareos-traymonitor-debuginfo +noarch/python2-bareos +noarch/python3-bareos +src/bareos +src/python-bareos +x86_64/bareos +x86_64/bareos-bconsole +x86_64/bareos-client +x86_64/bareos-common +x86_64/bareos-database-common +x86_64/bareos-database-postgresql +x86_64/bareos-database-sqlite3 +x86_64/bareos-database-tools +x86_64/bareos-director +x86_64/bareos-director-python-plugins-common +x86_64/bareos-director-python2-plugin +x86_64/bareos-director-python3-plugin +x86_64/bareos-filedaemon +x86_64/bareos-filedaemon-ceph-plugin +x86_64/bareos-filedaemon-ldap-python-plugin +x86_64/bareos-filedaemon-libcloud-python-plugin +x86_64/bareos-filedaemon-ovirt-python-plugin +x86_64/bareos-filedaemon-percona-xtrabackup-python-plugin +x86_64/bareos-filedaemon-postgresql-python-plugin +x86_64/bareos-filedaemon-python-plugins-common +x86_64/bareos-filedaemon-python2-plugin +x86_64/bareos-filedaemon-python3-plugin +x86_64/bareos-storage +x86_64/bareos-storage-ceph +x86_64/bareos-storage-droplet +x86_64/bareos-storage-fifo +x86_64/bareos-storage-python-plugins-common +x86_64/bareos-storage-python2-plugin +x86_64/bareos-storage-python3-plugin +x86_64/bareos-storage-tape +x86_64/bareos-tools +x86_64/bareos-traymonitor +x86_64/bareos-webui From c5f2720afa357689f9393bd4a8a1d3e8c9cdb48f Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 29 Jun 2021 21:10:52 +0200 Subject: [PATCH 4/4] remove mysql for openSUSE Leap 15.3 For info on SUSE RPM Macros, see: https://en.opensuse.org/openSUSE:Packaging_for_Leap --- core/platforms/packaging/bareos.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index f5d9b96e060..0cbc161b540 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -68,6 +68,11 @@ BuildRequires: libtirpc-devel %define build_mysql 0 %endif +# remove mysql from Leap 15.3 +%if 0%{?is_opensuse} && 0%{?sle_version} >= 150300 +%define build_mysql 0 +%endif + # # SUSE (openSUSE, SLES) specific settings #