container-selinux-2:2.2-2
- depend on selinux-policy-targeted - relabel docker-latest* files as well Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
98c88e3954
commit
8602eba442
@ -21,7 +21,7 @@
|
|||||||
%global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
|
%global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
|
||||||
|
|
||||||
# Relabel files
|
# Relabel files
|
||||||
%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/docker %{_localstatedir}/run/containerd.sock %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/docker.service %{_unitdir}/docker-containerd.service %{_sysconfdir}/docker %{_libexecdir}/docker &> /dev/null || :
|
%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/docker* %{_localstatedir}/run/containerd.sock %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/docker.service %{_unitdir}/docker-containerd.service %{_unitdir}/docker-latest.service %{_unitdir}/docker-latest-containerd.service %{_sysconfdir}/docker %{_libexecdir}/docker* &> /dev/null || :
|
||||||
|
|
||||||
# Version of SELinux we were using
|
# Version of SELinux we were using
|
||||||
%if 0%{?fedora} >= 22
|
%if 0%{?fedora} >= 22
|
||||||
@ -35,7 +35,7 @@ Name: container-selinux
|
|||||||
Epoch: 2
|
Epoch: 2
|
||||||
%endif
|
%endif
|
||||||
Version: 2.2
|
Version: 2.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: %{git0}
|
URL: %{git0}
|
||||||
Summary: SELinux policies for container runtimes
|
Summary: SELinux policies for container runtimes
|
||||||
@ -43,13 +43,12 @@ Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
|
BuildRequires: selinux-policy >= %{selinux_policyver}
|
||||||
|
BuildRequires: selinux-policy-devel >= %{selinux_policyver}
|
||||||
# RE: rhbz#1195804 - ensure min NVR for selinux-policy
|
# RE: rhbz#1195804 - ensure min NVR for selinux-policy
|
||||||
Requires: selinux-policy >= %{selinux_policyver}
|
Requires: selinux-policy >= %{selinux_policyver}
|
||||||
|
|
||||||
BuildRequires: selinux-policy
|
|
||||||
BuildRequires: selinux-policy-devel
|
|
||||||
Requires(post): selinux-policy-base >= %{selinux_policyver}
|
Requires(post): selinux-policy-base >= %{selinux_policyver}
|
||||||
|
Requires(post): selinux-policy-targeted >= %{selinux_policyver}
|
||||||
Requires(post): policycoreutils
|
Requires(post): policycoreutils
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
Requires(post): policycoreutils-python-utils
|
Requires(post): policycoreutils-python-utils
|
||||||
@ -118,6 +117,10 @@ fi
|
|||||||
%{_datadir}/selinux/*
|
%{_datadir}/selinux/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 07 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2-2
|
||||||
|
- depend on selinux-policy-targeted
|
||||||
|
- relabel docker-latest* files as well
|
||||||
|
|
||||||
* Fri Jan 06 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2-1
|
* Fri Jan 06 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2-1
|
||||||
- bump to v2.2
|
- bump to v2.2
|
||||||
- additional labeling for ocid
|
- additional labeling for ocid
|
||||||
|
Loading…
Reference in New Issue
Block a user