diff --git a/container-selinux.spec b/container-selinux.spec index 00eb2e6..d56e8ba 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -16,16 +16,13 @@ # Format must contain '$x' somewhere to do anything useful %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; -# Version of SELinux we were using -%global selinux_policyver 3.14.5-18 - # Hooked up to autobuilder, please check with @lsm5 before updating Name: container-selinux %if 0%{?fedora} Epoch: 2 %endif Version: 2.144.0 -Release: 4.dev.git%{shortcommit0}%{?dist} +Release: 5.dev.git%{shortcommit0}%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -33,12 +30,12 @@ Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz BuildArch: noarch BuildRequires: git BuildRequires: pkgconfig(systemd) -BuildRequires: selinux-policy >= %{selinux_policyver} -BuildRequires: selinux-policy-devel >= %{selinux_policyver} +BuildRequires: selinux-policy >= %_selinux_policy_version +BuildRequires: selinux-policy-devel >= %_selinux_policy_version # RE: rhbz#1195804 - ensure min NVR for selinux-policy -Requires: selinux-policy >= %{selinux_policyver} -Requires(post): selinux-policy-base >= %{selinux_policyver} -Requires(post): selinux-policy-targeted >= %{selinux_policyver} +Requires: selinux-policy >= %_selinux_policy_version +Requires(post): selinux-policy-base >= %_selinux_policy_version +Requires(post): selinux-policy-targeted >= %_selinux_policy_version Requires(post): policycoreutils Requires(post): libselinux-utils Requires(post): sed @@ -64,12 +61,6 @@ install -p -m 644 container.if %{buildroot}%{_datadir}/selinux/devel/include/ser install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages install -d %{buildroot}/%{_datadir}/containers/selinux install -m 644 container_contexts %{buildroot}/%{_datadir}/containers/selinux/contexts -# Currently shipped as part of selinux-policy package -#install -d %{buildroot}/%{_datadir}/man/man8 -#install -m 644 container_selinux.8 %{buildroot}/%{_datadir}/man/man8 - -# remove spec file -rm -rf container-selinux.spec %check @@ -111,6 +102,9 @@ fi # Hooked up to autobuilder, please check with @lsm5 before updating %changelog +* Mon Aug 31 2020 Lokesh Mandvekar - 2:2.144.0-5.dev.git5d929d4 +- Resolves: #1797554 - use _selinux_policy_version macro + * Fri Aug 28 2020 Lokesh Mandvekar - 2:2.144.0-4.dev.git5d929d4 - Resolves: #1780129 - bump min selinux-policy