rpms/selinux-policy/F-12 selinux-policy.spec,1.1012,1.1013

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9424

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Feb 4 2010 Dan Walsh <dwalsh at redhat.com> 3.6.32-84
- Fix /var/lib labeling in post install



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -p -r1.1012 -r1.1013
--- selinux-policy.spec	4 Feb 2010 18:23:37 -0000	1.1012
+++ selinux-policy.spec	4 Feb 2010 21:25:32 -0000	1.1013
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 83%{?dist}
+Release: 84%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -323,7 +323,7 @@ SELinux Reference policy targeted base m
 if [ $1 -eq 1 ]; then
    packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
-   restorecon -R /root /var/log /var/run 2> /dev/null
+   restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
 else
    semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit -r rtkit_daemon -r ModemManager 2>/dev/null
    packages="%{expand:%%moduleList targeted}"
@@ -376,7 +376,7 @@ SELinux Reference policy minimum base mo
 packages="execmem.pp.bz2 unconfined.pp.bz2 unconfineduser.pp.bz2"
 %loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
-restorecon -R /root /var/log /var/run 2> /dev/null
+   restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
 else
 %relabel minimum
 fi
@@ -442,7 +442,9 @@ semodule -n -s mls -r mailscanner -r pol
 packages="%{expand:%%moduleList mls}"
 %loadpolicy mls $packages
 
-if [ $1 != 1 ]; then
+if [ $1 -eq 1 ]; then
+   restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
+else
 %relabel mls
 fi
 exit 0
@@ -454,6 +456,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 4 2010 Dan Walsh <dwalsh at redhat.com> 3.6.32-84
+- Fix /var/lib labeling in post install
+
 * Wed Feb 4 2010 Miroslav Grepl <mgrepl at redhat.com> 3.6.32-83
 - Fixes for cluster policy