Merge pull request #1493

packaging: cleanup SUSE webui dependencies

.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:

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

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