rpms/udev/devel udev.spec,1.242,1.243

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28210

Modified Files:
	udev.spec 
Log Message:
* Fri Apr 11 2008 Harald Hoyer <harald at redhat.com> 120-3
- fixed pre/preun scriptlets (bug #441941)
- removed fedora specific patch for selinux symlink handling



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- udev.spec	5 Apr 2008 16:29:16 -0000	1.242
+++ udev.spec	11 Apr 2008 14:21:50 -0000	1.243
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 120
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -24,7 +24,6 @@
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
-Patch102: udev-118-slink-selinux.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -80,7 +79,6 @@
 
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
-%patch102 -p1 -b .slink
 
 %build
 
@@ -254,7 +252,7 @@
 mkdir -p $RPM_BUILD_ROOT/var/lib/udev/makedev.d
 
 %preun
-if [ "$1" = 0 -a -f %{_initrddir}/udev ]; then
+if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
 	if [ -x /sbin/pidof ]; then
 		pid=$(/sbin/pidof -c udevd)
 		if [ -n "$pid" ]; then
@@ -263,25 +261,20 @@
 	fi
 	/sbin/chkconfig --del udev
 fi
-if [ "$1" = 0 ]; then
+if [ "$1" -eq 0 ]; then
 	/sbin/chkconfig --del udev-post
 fi
 exit 0
 
 %post
-if [ "$1" -ge "1" -a -x /sbin/pidof ]; then
+if [ "$1" -gt 1 -a -x /sbin/pidof ]; then
 	pid=$(/sbin/pidof -c udevd)
 	if [ -n "$pid" ]; then
 		kill $pid
+		/sbin/udevd -d
 	fi
 fi
 
-
-if [ "$1" -ge "1" ]; then
-	/sbin/udevd -d
-	/sbin/chkconfig --del udev-post >/dev/null 2>&1 || :
-fi
-
 /sbin/chkconfig --add udev-post
 exit 0
 
@@ -401,6 +394,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Apr 11 2008 Harald Hoyer <harald at redhat.com> 120-3
+- fixed pre/preun scriptlets (bug #441941)
+- removed fedora specific patch for selinux symlink handling
+
 * Sat Apr 05 2008 Harald Hoyer <harald at redhat.com> 120-2
 - removed warning about deprecated /lib/udev/devices (rhbz#440961)
 - replaced /usr/bin/find with shell find function (rhbz#440961)