Resolves: #1406517 - bump to v2.0 (first upload to Fedora as a

standalone package)
include projectatomic/RHEL-1.12 branch commit for building on centos/rhel
This commit is contained in:
Daniel J Walsh 2017-01-06 15:21:04 -05:00
parent 7fa12a4c94
commit 85f5b33ced

View File

@ -1,14 +1,4 @@
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
# docker builds in a checksum of dockerinit into docker,
# so stripping the binaries breaks docker
%if 0%{?with_debug}
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
%global _dwz_low_mem_die_limit 0
%else
%global debug_package %{nil}
%endif
# container-selinux
%global git0 https://github.com/projectatomic/container-selinux
@ -99,12 +89,15 @@ if [ $1 -eq 1 ]; then
%{_sbindir}/setsebool -P -N virt_use_nfs=1 virt_sandbox_use_all_caps=1
fi
%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2
%{_sbindir}/semodule -n -s %{selinuxtype} -i $MODULES -X 100 -d docker -X 200 -d docker -X 400 -d docker -X 100 -d gear -X 200 -d gear -X 400 -d gear 2>&1 | grep -v docker
%{_sbindir}/semodule -n -s %{selinuxtype} -r container 2> /dev/null
%{_sbindir}/semodule -n -s %{selinuxtype} -d %{repo} 2> /dev/null
%{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null
%{_sbindir}/semodule -n -X 200 -s %{selinuxtype} -i $MODULES > /dev/null
if %{_sbindir}/selinuxenabled ; then
%{_sbindir}/load_policy
%relabel_files
if [ $1 -eq 1 ]; then
restorecon -R %{_sharedstatedir}/docker &> /dev/null || :
restorecon -R %{_sharedstatedir}/%{repo} &> /dev/null || :
fi
fi