diff --git a/memcached.spec b/memcached.spec index 23651dd..b8aeb2d 100644 --- a/memcached.spec +++ b/memcached.spec @@ -6,12 +6,12 @@ %global selinuxtype targeted %global selinuxmoduletype contrib %global selinuxmodulename memcached -%global selinuxmodulever 1.0 +%global selinuxmodulever 1.0.2 %global selinuxmoduledir %{selinuxmodulename}-selinux-%{selinuxmodulever} Name: memcached Version: 1.5.10 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: High Performance, Distributed Memory Object Cache @@ -21,7 +21,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 Patch1: memcached-unit.patch @@ -32,6 +32,11 @@ BuildRequires: perl(Test::More), perl(Test::Harness) %{?with_seccomp:BuildRequires: libseccomp-devel} Requires(pre): shadow-utils +# 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) %{?systemd_requires} %description @@ -165,9 +170,14 @@ fi %files selinux %attr(0644,root,root) %{_datadir}/selinux/packages/%{selinuxmodulename}.pp.bz2 %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{selinuxmodulename} -%license COPYING +%license ../%{selinuxmoduledir}/COPYING %changelog +* Thu Aug 30 2018 Vit Mojzis - 0:1.5.10-2 +- selinux: Update to 1.0.2 +- selinux: Use license file from memcached-selinux tar +- add "Requires" for selinux subpackage + * Mon Aug 13 2018 Miroslav Lichvar - 0:1.5.10-1 - update to 1.5.10 - add conditional for running tests in check stage diff --git a/sources b/sources index db68280..07592bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (memcached-selinux-1.0.tar.gz) = 0b1f65c2f45fe15d45f470cd42c8164865d4f667cca5a2139098fdc41afa52ac867cf8edf360c8f59b878e2e41a07edd6673162f097ad9be079cffa1ddecdea5 +SHA512 (memcached-selinux-1.0.2.tar.gz) = 7db24bbf10d002cfa5870aa0f937197c26d7b885b0652fc5c426919a4e7039274963a5677e7306e7b05927a40cecfef9054de523e273b36a4b3bee7ca27ae48c SHA512 (memcached-1.5.10.tar.gz) = 5b6217ab90492cb4b3f6597c935a4028697f1d071516d647a70f6ba9353db16184ef229935733e669d4120d34d72f6f2415edcfd3ec899e06eab9d3f494f11f1