From 7a0f786bccf1b2e78d303fd2b9b5efdc517d6dce Mon Sep 17 00:00:00 2001
From: Andreas Rogge <andreas.rogge@bareos.com>
Date: Mon, 26 Jun 2023 11:44:56 +0200
Subject: [PATCH 1/3] matrix: add openSUSE/SLE 15.5 to test-images

---
 .matrix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.matrix.yml b/.matrix.yml
index 66765a88b75..3bb76d35edd 100644
--- a/.matrix.yml
+++ b/.matrix.yml
@@ -48,7 +48,7 @@ OS:
     "15":
       TYPE: rpm
       IMAGE: sle154
-      CUSTOM_TEST_IMAGES: [ SLE-15_SP3, SLE-15_SP4, openSUSE-Leap_15.4 ]
+      CUSTOM_TEST_IMAGES: [ SLE-15_SP3, SLE-15_SP4, openSUSE-Leap_15.4, SLE-15_SP5, openSUSE-Leap_15.5 ]
       ARCH:
       - x86_64
       PROJECTPACKAGES:

From d8c2a01db252ef7b9d2cb5c5336d94e932b948d8 Mon Sep 17 00:00:00 2001
From: Andreas Rogge <andreas.rogge@bareos.com>
Date: Mon, 26 Jun 2023 14:26:16 +0200
Subject: [PATCH 2/3] packaging: webui RPM should require httpd only

and should not require apache2 with a specific MPM installed.
---
 core/platforms/packaging/bareos.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
index cfb11fc68c8..1512b8f41bb 100644
--- a/core/platforms/packaging/bareos.spec
+++ b/core/platforms/packaging/bareos.spec
@@ -711,20 +711,15 @@ Requires: php-zip
 Requires: php-libxml
 %endif
 
-%if 0%{?rhel} || 0%{?fedora}
 Requires: httpd
+%if 0%{?rhel} || 0%{?fedora}
 %define _apache_conf_dir /etc/httpd/conf.d/
 %define www_daemon_user apache
 %define www_daemon_group apache
 %endif
 
 %if 0%{?suse_version} || 0%{?sle_version}
-%if 0%{?sle_version} == 120500
-Requires: apache2
-%else
-Requires: apache2-event
-%endif
-Requires: apache2-mod_fcgid
+Conflicts: mod_php_any
 %define _apache_conf_dir /etc/apache2/conf.d/
 %define www_daemon_user wwwrun
 %define www_daemon_group www

From ec8bddd04a862c071fc9298e8886f33cf1e90a6a Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Tue, 27 Jun 2023 09:32:56 +0200
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf40f37af5a..6dd1a9ebed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - build: add Debian 12 [PR #1477]
 - pr-tool: Add options to be used in CI runs [PR #1488]
 - VMware Plugin: improve snapshot cleanup [PR #1484]
+- packaging: cleanup SUSE webui dependencies [PR #1493]
 
 ### Removed
 - remove no longer used pkglists [PR #1335]
@@ -190,4 +191,5 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 [PR #1479]: https://github.com/bareos/bareos/pull/1479
 [PR #1484]: https://github.com/bareos/bareos/pull/1484
 [PR #1488]: https://github.com/bareos/bareos/pull/1488
+[PR #1493]: https://github.com/bareos/bareos/pull/1493
 [unreleased]: https://github.com/bareos/bareos/tree/master