rpms/util-linux/devel util-linux.spec,1.122,1.123

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28554

Modified Files:
	util-linux.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.27
- Only execute chcon on machines with selinux enabled



Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- util-linux.spec	14 Jun 2006 14:49:17 -0000	1.122
+++ util-linux.spec	21 Jun 2006 12:51:10 -0000	1.123
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.26
+Release: 0.27
 License: distributable
 Group: System Environment/Base
 
@@ -501,7 +501,9 @@
 chown root:root /var/log/lastlog
 chmod 0644 /var/log/lastlog
 # Fix the file context, do not use restorecon
-chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+	chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
+fi
 
 %postun
 if [ "$1" = 0 ]; then
@@ -695,6 +697,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.27
+- Only execute chcon on machines with selinux enabled
+
 * Wed Jun 14 2006 Steve Dickson <steved at redhat.com> 2.13-0.26
 - Remove unneeded header files from nfsmount.c