Fixup spec file conditionals
This commit is contained in:
parent
5cb66e7ed3
commit
9a3633bb6b
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# container-selinux
|
# container-selinux
|
||||||
%global git0 https://github.com/projectatomic/container-selinux
|
%global git0 https://github.com/projectatomic/container-selinux
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
%global commit0 c89e9b5e450367cfbed32d6c166ce04353f2bba7
|
%global commit0 c89e9b5e450367cfbed32d6c166ce04353f2bba7
|
||||||
%else
|
%else
|
||||||
# use upstream's RHEL-1.12 branch for CentOS 7
|
# use upstream's RHEL-1.12 branch for CentOS 7
|
||||||
@ -25,18 +25,18 @@
|
|||||||
%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/*runc* %{_bindir}/*crio %{_bindir}/docker* %{_localstatedir}/run/containerd.sock %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_sysconfdir}/crio %{_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 || :
|
%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/*runc* %{_bindir}/*crio %{_bindir}/docker* %{_localstatedir}/run/containerd.sock %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_sysconfdir}/crio %{_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 || 0%{?rhel} > 7
|
||||||
%global selinux_policyver 3.13.1-220
|
%global selinux_policyver 3.13.1-220
|
||||||
%else
|
%else
|
||||||
%global selinux_policyver 3.13.1-39
|
%global selinux_policyver 3.13.1-39
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: container-selinux
|
Name: container-selinux
|
||||||
%if 0%{?fedora} || 0%{?centos}
|
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} > 7
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
%endif
|
%endif
|
||||||
Version: 2.21
|
Version: 2.21
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: %{git0}
|
URL: %{git0}
|
||||||
Summary: SELinux policies for container runtimes
|
Summary: SELinux policies for container runtimes
|
||||||
@ -51,7 +51,7 @@ Requires: selinux-policy >= %{selinux_policyver}
|
|||||||
Requires(post): selinux-policy-base >= %{selinux_policyver}
|
Requires(post): selinux-policy-base >= %{selinux_policyver}
|
||||||
Requires(post): selinux-policy-targeted >= %{selinux_policyver}
|
Requires(post): selinux-policy-targeted >= %{selinux_policyver}
|
||||||
Requires(post): policycoreutils
|
Requires(post): policycoreutils
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
Requires(post): policycoreutils-python-utils
|
Requires(post): policycoreutils-python-utils
|
||||||
%else
|
%else
|
||||||
Requires(post): policycoreutils-python
|
Requires(post): policycoreutils-python
|
||||||
@ -118,6 +118,9 @@ fi
|
|||||||
%{_datadir}/selinux/*
|
%{_datadir}/selinux/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 14 2017 Troy Dawson <tdawson@redhat.com> - 2.21-3
|
||||||
|
- Fixup spec file conditionals
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.21-2
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.21-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user