lsm5 pushed to docker (master). "move %post selinux inside f23 conditional (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Mar 26 16:50:33 UTC 2015


>From 735fdba812d21e6681cc1f0be1fd4de6f7a686e6 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Thu, 26 Mar 2015 11:38:02 -0500
Subject: move %post selinux inside f23 conditional

Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

diff --git a/docker.spec b/docker.spec
index 550239f..602df9c 100644
--- a/docker.spec
+++ b/docker.spec
@@ -394,8 +394,8 @@ exit 0
 %post
 %systemd_post %{name}
 
-%post selinux
 %if 0%{?fedora} >= 23
+%post selinux
 # Install all modules in a single transaction
 %_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2
 %{_sbindir}/semodule -n -s %{selinuxtype} -i $MODULES
@@ -411,8 +411,8 @@ fi
 %postun
 %systemd_postun_with_restart %{name}
 
-%postun selinux
 %if 0%{?fedora} >= 23
+%postun selinux
 if [ $1 -eq 0 ]; then
 %{_sbindir}/semodule -n -r %{modulenames} &> /dev/null || :
 if %{_sbindir}/selinuxenabled ; then
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/docker.git/commit/?h=master&id=735fdba812d21e6681cc1f0be1fd4de6f7a686e6


More information about the scm-commits mailing list