rpms/util-linux/devel util-linux.spec,1.111,1.112

[fedora-cvs-commits at redhat.com]

Author: jkeating

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

Modified Files:
	util-linux.spec 
Log Message:
cleanups suggested by notting.



Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- util-linux.spec	9 Mar 2006 22:21:16 -0000	1.111
+++ util-linux.spec	9 Mar 2006 22:51:31 -0000	1.112
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.19
+Release: 0.20
 License: distributable
 Group: System Environment/Base
 
@@ -63,6 +63,7 @@
 Requires: audit-libs >= 1.0.6
 Conflicts: kernel < 2.2.12-7, 
 Prereq: /sbin/install-info
+Prereq: /sbin/restorecon
 Provides: mount = %{version}
 Provides: losetup = %{version}
 Provides: schedutils
@@ -449,7 +450,7 @@
 touch /var/log/lastlog
 chown root:root /var/log/lastlog
 chmod 0644 /var/log/lastlog
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/log/lastlog
+/sbin/restorecon /var/log/lastlog >/dev/null 2>&1
 
 %postun
 if [ "$1" = 0 ]; then
@@ -643,6 +644,10 @@
 /sbin/losetup
 
 %changelog
+* Wed Mar  9 2006 Jesse Keating <jkeating at redhat.com> 2.13-0.20
+- Better calling of restorecon as suggested by Bill Nottingham
+- prereq restorecon to avoid ordering issues
+
 * Wed Mar  9 2006 Jesse Keating <jkeating at redhat.com> 2.13-0.19
 - restorecon /var/log/lastlog