From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Dec 2019 11:19:16 +0000 (+0100)
Subject: baculum: Tweak requirements in spec file
X-Git-Tag: Release-9.6.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dcec44c37cf56b499b6e9f36ae80115e2e12ec6;p=thirdparty%2Fbacula.git

baculum: Tweak requirements in spec file
---

diff --git a/gui/baculum/examples/rpm-template/baculum.spec b/gui/baculum/examples/rpm-template/baculum.spec
index 340c641dd..5fa12699c 100644
--- a/gui/baculum/examples/rpm-template/baculum.spec
+++ b/gui/baculum/examples/rpm-template/baculum.spec
@@ -145,7 +145,7 @@ By using this module it is possible to run Baculum WebGUI in Lighttpd environmen
 
 %package api-selinux
 Summary:                SELinux module for Baculum API
-Requires:               %name-api-selinux = %version-%release
+Requires:               %name-api = %version-%release
 Group:                  Applications/Internet
 Requires(post):         policycoreutils-python-utils
 Requires(preun):        policycoreutils-python-utils
@@ -157,7 +157,7 @@ can be run in enforcing mode.
 
 %package web-selinux
 Summary:                SELinux module for Baculum Web
-Requires:               %name-web-selinux = %version-%release
+Requires:               %name-web = %version-%release
 Group:                  Applications/Internet
 Requires(post):         policycoreutils-python-utils
 Requires(preun):        policycoreutils-python-utils
@@ -179,6 +179,7 @@ make -C examples/selinux/ -f %{_datadir}/selinux/devel/Makefile %{name}-web.pp
 # Remove these cache directories, because here will be symbolic links
 rmdir %{destdir}/%{_datadir}/%{metaname}/htdocs/assets
 rmdir %{destdir}/%{_datadir}/%{metaname}/htdocs/protected/runtime
+rm %{destdir}/%{metaname}-install-checker.sh
 for lang in  %{langs_api}; do
 	rm %{destdir}/%{_datadir}/%{metaname}/htdocs/protected/API/Lang/${lang}/messages.mo
 done
diff --git a/gui/baculum/examples/rpm/baculum.spec b/gui/baculum/examples/rpm/baculum.spec
index 340c641dd..5fa12699c 100644
--- a/gui/baculum/examples/rpm/baculum.spec
+++ b/gui/baculum/examples/rpm/baculum.spec
@@ -145,7 +145,7 @@ By using this module it is possible to run Baculum WebGUI in Lighttpd environmen
 
 %package api-selinux
 Summary:                SELinux module for Baculum API
-Requires:               %name-api-selinux = %version-%release
+Requires:               %name-api = %version-%release
 Group:                  Applications/Internet
 Requires(post):         policycoreutils-python-utils
 Requires(preun):        policycoreutils-python-utils
@@ -157,7 +157,7 @@ can be run in enforcing mode.
 
 %package web-selinux
 Summary:                SELinux module for Baculum Web
-Requires:               %name-web-selinux = %version-%release
+Requires:               %name-web = %version-%release
 Group:                  Applications/Internet
 Requires(post):         policycoreutils-python-utils
 Requires(preun):        policycoreutils-python-utils
@@ -179,6 +179,7 @@ make -C examples/selinux/ -f %{_datadir}/selinux/devel/Makefile %{name}-web.pp
 # Remove these cache directories, because here will be symbolic links
 rmdir %{destdir}/%{_datadir}/%{metaname}/htdocs/assets
 rmdir %{destdir}/%{_datadir}/%{metaname}/htdocs/protected/runtime
+rm %{destdir}/%{metaname}-install-checker.sh
 for lang in  %{langs_api}; do
 	rm %{destdir}/%{_datadir}/%{metaname}/htdocs/protected/API/Lang/${lang}/messages.mo
 done