rpms/udev/F-12 udev-145-modem-modeswitch.patch, NONE, 1.1 udev-post.init, 1.9, 1.10 udev.spec, 1.297, 1.298

Thu Nov 5 13:08:45 UTC 2009

Author: harald

Update of /cvs/pkgs/rpms/udev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29995

Modified Files:
	udev-post.init udev.spec 
Added Files:
	udev-145-modem-modeswitch.patch 
Log Message:
* Thu Nov 05 2009 Harald Hoyer <harald at redhat.com> 145-13
- obsolete DeviceKit and DeviceKit-devel (#532961)
- add NEWS file to the doc section
- automatically turn on hotplugged CPUs (#523127)
- fixed udev-post exit codes (#523976)
- own directory /lib/udev/keymaps (#521801)
- no more floppy modaliases (#514329)
- added two more modems to modem-modeswitch.rules (#515349)


udev-145-modem-modeswitch.patch:
 61-option-modem-modeswitch.rules |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE udev-145-modem-modeswitch.patch ---
diff -up udev-145/extras/modem-modeswitch/61-option-modem-modeswitch.rules.old udev-145/extras/modem-modeswitch/61-option-modem-modeswitch.rules
--- udev-145/extras/modem-modeswitch/61-option-modem-modeswitch.rules.old	2009-11-05 14:06:01.000000000 +0100
+++ udev-145/extras/modem-modeswitch/61-option-modem-modeswitch.rules	2009-11-05 14:06:23.000000000 +0100
@@ -34,5 +34,7 @@ ATTRS{idVendor}=="0af0", ATTRS{idProduct
 ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7501", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
 ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7601", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
 ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7901", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
+ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1446", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="2000", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
 
 LABEL="option_zerocd_end"


Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev-post.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- udev-post.init	24 Jul 2009 08:17:35 -0000	1.9
+++ udev-post.init	5 Nov 2009 13:08:44 -0000	1.10
@@ -23,6 +23,7 @@
 # See how we were called.
 case "$1" in
   start|reload)
+	[ -w /var/lock/subsys/udev-post ] || exit 4
 	STRING=$"Retrigger failed udev events"
 	echo -n $STRING 
 	/sbin/udevadm trigger --retry-failed
@@ -53,6 +54,7 @@ case "$1" in
 	exit 0
 	;;
   stop)
+	[ -w /var/lock/subsys/udev-post ] || exit 4
 	STRING=$"Generating udev makedev cache file"	
 	MAKEDEV="/sbin/MAKEDEV"
 	USE_MD5="false"
@@ -85,10 +87,10 @@ case "$1" in
 	exit 0
 	;;
   status)
-	exit 0
+	exit 3
 	;;
   *)
         echo $"Usage: $0 {start|stop|reload}"
-        exit 1
+        exit 3
 esac
 exit 0


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- udev.spec	5 Nov 2009 00:19:42 -0000	1.297
+++ udev.spec	5 Nov 2009 13:08:44 -0000	1.298
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -20,8 +20,10 @@ Patch3: 0003-fix-wrong-parameter-size-on
 Patch4: 0004-fix-single-session-CD-detection.patch
 Patch5: 0005-fix-previous-commit-for-CD-detection.patch
 Patch6: ck-runseat.patch
+Patch7: udev-141-cpu-online.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=532628
-Patch7: udev-145-hid2hci-backport.patch
+Patch8: udev-145-hid2hci-backport.patch
+Patch9: udev-145-modem-modeswitch.patch
 BuildRequires: libtool automake autoconf
 
 Source1: start_udev
@@ -52,6 +54,8 @@ Conflicts: kernel < 0:2.6 mkinitrd <= 0:
 Requires: util-linux-ng >= 2.15.1
 Obsoletes: dev <= 0:3.12-1
 Provides: dev = 0:3.12-2
+Obsoletes: DeviceKit < 004
+Obsoletes: DeviceKit-devel < 004
 
 %description
 The udev package contains an implementation of devfs in 
@@ -110,7 +114,9 @@ glib-based applications using libudev fu
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .ck041
-%patch7 -p1 -b .hid2hci
+%patch7 -p1 
+%patch8 -p1 -b .hid2hci
+%patch9 -p1
 autoreconf -i
 automake
 
@@ -180,12 +186,6 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_RO
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
-mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp.conf <<EOF
-alias pnp:dPNP0700 floppy
-alias acpi:PNP0700: floppy
-EOF
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
 
@@ -265,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root, 0755)
-%doc COPYING README TODO ChangeLog docs/* extras/keymap/README.keymap.txt
+%doc COPYING README TODO ChangeLog docs/* extras/keymap/README.keymap.txt NEWS
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/udevtrigger
@@ -307,8 +307,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %ghost %config(noreplace,missingok) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
 
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp.conf
-
 %dir %attr(0755,root,root) %{firmwaredir}
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
 %attr(0644,root,root) %{_mandir}/man7/udev*.7*
@@ -329,6 +327,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/udev-acl
 %attr(0755,root,root) %{udev_scriptdir}/v4l_id
 %attr(0755,root,root) %{udev_scriptdir}/findkeyboards
+%dir %attr(0755,root,root) %{udev_scriptdir}/keymaps
 %attr(0644,root,root) %{udev_scriptdir}/keymaps/*
 %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
@@ -364,6 +363,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Nov 05 2009 Harald Hoyer <harald at redhat.com> 145-13
+- obsolete DeviceKit and DeviceKit-devel (#532961)
+- add NEWS file to the doc section
+- automatically turn on hotplugged CPUs (#523127)
+- fixed udev-post exit codes (#523976)
+- own directory /lib/udev/keymaps (#521801)
+- no more floppy modaliases (#514329)
+- added two more modems to modem-modeswitch.rules (#515349)
+
 * Thu Nov 05 2009 Bastien Nocera <bnocera at redhat.com> 145-12
 - Update hid2hci from udev master, fixes problems with Dell
   Bluetooth dongles not working (#532628)


