From 12fbb1202b0c12988769675d01a5163fdd0884cc Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Mon, 18 Jul 2022 15:18:56 +0200 Subject: [PATCH 1/4] build: add support for SLE15SP4 --- .matrix.yml | 9 ++++++ docs/pkglists/SLE_15_SP4.x86_64 | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 docs/pkglists/SLE_15_SP4.x86_64 diff --git a/.matrix.yml b/.matrix.yml index 393fbd53105..7eca5345ca1 100644 --- a/.matrix.yml +++ b/.matrix.yml @@ -73,6 +73,15 @@ OS: - python-bareos SLE: + "15_SP4": + TYPE: rpm + IMAGE: sle154 + ARCH: + - x86_64 + PROJECTPACKAGES: + x86_64: + - bareos + - python-bareos "15_SP3": TYPE: rpm IMAGE: sle153 diff --git a/docs/pkglists/SLE_15_SP4.x86_64 b/docs/pkglists/SLE_15_SP4.x86_64 new file mode 100644 index 00000000000..4ba3b9d3320 --- /dev/null +++ b/docs/pkglists/SLE_15_SP4.x86_64 @@ -0,0 +1,56 @@ +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-tools-debuginfo +debug/x86_64/bareos-debuginfo +debug/x86_64/bareos-debugsource +debug/x86_64/bareos-director-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-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-python3-plugin-debuginfo +debug/x86_64/bareos-storage-tape-debuginfo +debug/x86_64/bareos-tools-debuginfo +debug/x86_64/bareos-traymonitor-debuginfo +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-contrib-director-python-plugins +x86_64/bareos-contrib-filedaemon-python-plugins +x86_64/bareos-contrib-tools +x86_64/bareos-database-common +x86_64/bareos-database-postgresql +x86_64/bareos-database-tools +x86_64/bareos-director +x86_64/bareos-director-python-plugins-common +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-mariabackup-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-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-python3-plugin +x86_64/bareos-storage-tape +x86_64/bareos-tools +x86_64/bareos-traymonitor +x86_64/bareos-webui From 8af074b4ef1933c4e5cd52f266aea1689399c56f Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 19 Jul 2022 09:45:23 +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 03d35405241..4bfdafd7939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https: - dird: console: add the ability to rerun multiple commas separated jobids [PR #1170] - build: Add support for Ubuntu 22.04, Fedora 36, EL 9, openSUSE 15.4 [PR #1179] - tests: skip mysql tests if root [PR #1197] +- build: Add support for SLE_15_SP4 [PR #1205] ### Fixed - python plugins: store architecture specific modules in sitearch (instead of sitelib) [PR #698] From 11c7f95070aa3d37eed7bace3b768507bb2fa9f1 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 19 Jul 2022 17:34:55 +0200 Subject: [PATCH 3/4] bareos.spec: remove BuildRequires: tcpd-devel --- core/platforms/packaging/bareos.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index 65b998d269b..0f1bb5dff5c 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -233,7 +233,6 @@ BuildRequires: python3-devel >= 3.4 BuildRequires: distribution-release BuildRequires: pwdutils -BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(json-c) From b8d31e9b6e469bb568f3e976f0878817b34d2e46 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 19 Jul 2022 17:39:25 +0200 Subject: [PATCH 4/4] debian/control: remove libwrap0-dev dependency --- debian/control | 1 - debian/control.src | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/control b/debian/control index 18151cabb24..ec394c7f476 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,6 @@ Build-Depends: acl-dev, qtbase5-dev, libreadline-dev, libssl-dev, - libwrap0-dev, libx11-dev, libxml2-dev, libpq-dev, diff --git a/debian/control.src b/debian/control.src index 006f42042db..df8df536144 100644 --- a/debian/control.src +++ b/debian/control.src @@ -22,7 +22,6 @@ Build-Depends: acl-dev, qtbase5-dev, libreadline-dev, libssl-dev, - libwrap0-dev, libx11-dev, libxml2-dev, libpq-dev,