rpms/udev/devel udev-post.init, 1.10, 1.11 udev.spec, 1.298, 1.299 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch, 1.1, NONE udev-147-modem-modeswitch.patch, 1.1, NONE

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23119

Modified Files:
	udev-post.init udev.spec 
Removed Files:
	0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch 
	udev-147-modem-modeswitch.patch 
Log Message:
* Wed Jan 27 2010 Harald Hoyer <harald at redhat.com> 151-1
- version 151
- fixed udev-post initscript
- only require s390utils-base, rather than s390utils (#553156)



Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- udev-post.init	12 Nov 2009 09:58:24 -0000	1.10
+++ udev-post.init	27 Jan 2010 15:36:52 -0000	1.11
@@ -23,7 +23,7 @@
 # See how we were called.
 case "$1" in
   start|reload)
-	[ -w /var/lock/subsys/udev-post ] || exit 4
+	[ -w /var/lock/subsys ] || exit 4
 	STRING=$"Retrigger failed udev events"
 	echo -n $STRING 
 	/sbin/udevadm trigger --retry-failed
@@ -54,7 +54,7 @@ case "$1" in
 	exit 0
 	;;
   stop)
-	[ -w /var/lock/subsys/udev-post ] || exit 4
+	[ -w /var/lock/subsys ] || exit 4
 	STRING=$"Generating udev makedev cache file"	
 	MAKEDEV="/sbin/MAKEDEV"
 	USE_MD5="false"
@@ -91,6 +91,6 @@ case "$1" in
 	;;
   *)
         echo $"Usage: $0 {start|stop|reload}"
-        exit 3
+        exit 2
 esac
 exit 0


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- udev.spec	24 Nov 2009 11:26:19 -0000	1.298
+++ udev.spec	27 Jan 2010 15:36:52 -0000	1.299
@@ -4,8 +4,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 147
-Release: 2%{?dist}
+Version: 151
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -14,8 +14,6 @@ Obsoletes: udev-extras < 20090618
 Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 Patch1: udev-141-cpu-online.patch
-Patch2: 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch
-Patch3: udev-147-modem-modeswitch.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -31,8 +29,8 @@ Requires(pre): MAKEDEV >= 0:3.11 /usr/bi
 Requires: hwdata
 
 %ifarch s390 s390x
-# Require s390utils, because it's essential on s390
-Requires: s390utils
+# Require s390utils-base, because it's essential on s390
+Requires: s390utils-base
 %endif
 
 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
@@ -112,8 +110,6 @@ glib-based applications using libudev fu
 %prep 
 %setup -q  
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 # get rid of rpath
@@ -259,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root, 0755)
-%doc NEWS COPYING README TODO ChangeLog docs/* extras/keymap/README.keymap.txt
+%doc NEWS COPYING README TODO ChangeLog  extras/keymap/README.keymap.txt
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/udevtrigger
@@ -276,12 +272,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/hid2hci
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
 %attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
-%attr(0755,root,root) %{udev_scriptdir}/firmware.sh
+%attr(0755,root,root) %{udev_scriptdir}/firmware
 %attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
 %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
 %attr(0755,root,root) %{udev_scriptdir}/write_net_rules
 %attr(0755,root,root) %{udev_scriptdir}/collect
 %attr(0755,root,root) %{udev_scriptdir}/fstab_import
+%attr(0755,root,root) %{udev_scriptdir}/input_id
+%attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh
+
 
 %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
@@ -328,12 +327,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libudev
 %defattr(0644, root, root, 0755)
-%doc COPYING
+%doc COPYING 
 %attr(0755,root,root) /%{_lib}/libudev.so.*
 
 %files -n libudev-devel
 %defattr(0644, root, root, 0755)
-%doc COPYING
+%doc COPYING libudev/docs/html/*
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
@@ -348,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgudev1-devel
 %defattr(0644, root, root, 0755)
-%doc COPYING
+%doc COPYING extras/gudev/docs/html/*
 %attr(0755,root,root) %{_libdir}/libgudev-1.0.so
 %attr(0644,root,root) %{_includedir}/gudev-1.0/gudev/*.h
 %attr(0644,root,root) %{_datadir}/gir-1.0/GUdev-1.0.gir
@@ -357,6 +356,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Jan 27 2010 Harald Hoyer <harald at redhat.com> 151-1
+- version 151
+- fixed udev-post initscript
+- only require s390utils-base, rather than s390utils (#553156)
+
 * Tue Nov 24 2009 Harald Hoyer <harald at redhat.com> 147-2
 - require s390utils, because it's essential on s390
 


--- 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch DELETED ---


--- udev-147-modem-modeswitch.patch DELETED ---