rpms/nut/F-13 nut-2.4.3-udev.patch,NONE,1.1 nut.spec,1.81,1.82

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/pkgs/rpms/nut/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10283

Modified Files:
	nut.spec 
Added Files:
	nut-2.4.3-udev.patch 
Log Message:
* Fri Mar 26 2010 Michal Hlavinka <mhlavink at redhat.com> - 2.4.3-3
- replace BUS with SUBSYSTEMS in udev rules (#573806)


nut-2.4.3-udev.patch:
 nut-usbups.rules.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nut-2.4.3-udev.patch ---
change BUS to SUBSYSTEMS in udev rules

There is one missing change in nut-usbups.rules.in: BUS -> SUBSYSTEMS. 
Previous change (rev2071) missed this. Now, the latest udev started to complain:
... udevd[31526]: BUS= will be removed in a future udev version ... 
Information about udev change can be found in udev repo:
http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4

Index: scripts/udev/nut-usbups.rules.in
===================================================================
--- scripts/udev/nut-usbups.rules.in	(revision 2405)
+++ scripts/udev/nut-usbups.rules.in	(working copy)
@@ -3,7 +3,7 @@
 ACTION!="add", GOTO="nut-usbups_rules_end"
 SUBSYSTEM=="usb_device", GOTO="nut-usbups_rules_real"
 SUBSYSTEM=="usb", GOTO="nut-usbups_rules_real"
-BUS!="usb", GOTO="nut-usbups_rules_end"
+SUBSYSTEMS!="usb", GOTO="nut-usbups_rules_end"
 
 LABEL="nut-usbups_rules_real"
 #  Krauler UP-M500VA  - megatec_usb


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/F-13/nut.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- nut.spec	23 Mar 2010 10:12:09 -0000	1.81
+++ nut.spec	26 Mar 2010 12:16:21 -0000	1.82
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +26,9 @@ Patch1: nut-2.2.2-halpath.patch
 #from upstream, required for nut <= 2.4.3, bz#575334
 Patch2: nut-2.4.3-bz575334.patch
 
+#sent upstream, rhbz#573806
+Patch3: nut-2.4.3-udev.patch
+
 Requires: nut-client => 2.4.0 hal
 Requires(pre): hal
 Requires(post): fileutils chkconfig initscripts
@@ -120,6 +123,7 @@ necessary to develop NUT client applicat
 %patch0 -p1 -b .conf
 %patch1 -p1 -b .halpath
 %patch2 -p1 -b .bz575334
+%patch3 -p1 -b .udevpatch
 
 %build
 autoreconf -i
@@ -360,6 +364,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Fri Mar 26 2010 Michal Hlavinka <mhlavink at redhat.com> - 2.4.3-3
+- replace BUS with SUBSYSTEMS in udev rules (#573806)
+
 * Mon Mar 23 2010 Michal Hlavinka <mhlavink at redhat.com> - 2.4.3-2
 - reduced size of buffer to maximum size supported by low-speed USB devices
 - fixes #575334