summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-10-15 16:00:08 +0200
committerRemi Collet <remi@remirepo.net>2018-10-15 16:00:08 +0200
commit3b6fc201e07a3668cef510f263a4ae62f531b42d (patch)
tree1adf06c080c9e53fc6181bc4ecf50b43e34b6135
parent08934361de0532a44ea8218028804350dfe6f2ea (diff)
sync with Fedora changes
-rw-r--r--memcached.spec18
1 files changed, 15 insertions, 3 deletions
diff --git a/memcached.spec b/memcached.spec
index 2c422fb..a308a5d 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -29,7 +29,7 @@
%global selinuxtype targeted
%global selinuxmoduletype contrib
%global selinuxmodulename memcached
-%global selinuxmodulever 1.0
+%global selinuxmodulever 1.0.2
%global selinuxmoduledir %{selinuxmodulename}-selinux-%{selinuxmodulever}
# disable testing as it is unreliable on build systems
@@ -47,7 +47,7 @@ URL: https://www.memcached.org/
Source0: https://www.memcached.org/files/%{name}-%{version}.tar.gz
Source1: memcached.sysconfig
# SELinux policy sources: https://pagure.io/memcached-selinux/tree/master
-Source2: https://pagure.io/memcached-selinux/raw/master/f/%{selinuxmoduledir}.tar.gz
+Source2: https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz
# custom init script
Source4: memcached.sysv
@@ -79,6 +79,13 @@ Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
%endif
Requires(pre): shadow-utils
+%if %{with_selinux}
+# Rich dependency syntax - require selinux policy subpackage
+# when selinux-policy-targeted is installed
+# This ensures that the selinux subpackage is not installed when not needed
+# (e.g. inside a container)
+Requires: (%{name}-selinux if selinux-policy-targeted)
+%endif
%if %{with_selinux}
@@ -317,11 +324,16 @@ fi
%defattr(-,root,root,0755)
%attr(0644,root,root) %{_datadir}/selinux/packages/%{selinuxmodulename}.pp.bz2
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{selinuxmodulename}
-%license COPYING
+%license ../%{selinuxmoduledir}/COPYING
%endif
%changelog
+* Thu Aug 30 2018 Vit Mojzis <vmojzis@redhat.com> - 0:1.5.10-2
+- selinux: Update to 1.0.2
+- selinux: Use license file from memcached-selinux tar
+- add "Requires" for selinux subpackage
+
* Tue Aug 14 2018 Remi Collet <remi@remirepo.net> - 0:1.5.10-1
- Update to 1.5.10