rpms/hplip/devel hplip-udev-rules.patch, NONE, 1.1 hplip.spec, 1.147, 1.148

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-udev-rules.patch 
Log Message:
* Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-9
- Fixed the udev rules file (bug #248740, bug #249025).


hplip-udev-rules.patch:

--- NEW FILE hplip-udev-rules.patch ---
--- hplip-2.7.6/55-hpmud.rules.udev-rules	2007-07-20 14:13:01.000000000 +0100
+++ hplip-2.7.6/55-hpmud.rules	2007-07-20 14:13:32.000000000 +0100
@@ -1,5 +1,7 @@
 # TODO: add PROGRAM rule for 7/xx/xx printer class interface
-SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+SUBSYSTEM!="usb", GOTO="hpmud_rules_end"
+ATTR{devnum}!="?*", GOTO="hpmud_rules_end"
+ATTR{busnum}!="?*", GOTO="hpmud_rules_end"
 ACTION!="add", GOTO="hpmud_rules_end"
-SYSFS{idVendor}=="03f0", GROUP="lp"
+SYSFS{idVendor}=="03f0", GROUP="lp", MODE="0664"
 LABEL="hpmud_rules_end"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- hplip.spec	17 Jul 2007 14:55:32 -0000	1.147
+++ hplip.spec	20 Jul 2007 13:25:43 -0000	1.148
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,6 +19,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
+Patch6: hplip-udev-rules.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
 Patch11: hplip-unload-traceback.patch
@@ -102,6 +103,9 @@
 # libhpip should link against libm (bug #197599).
 %patch5 -p1 -b .libm
 
+# Fix the udev rules file (bug #248740).
+%patch6 -p1 -b .udev-rules
+
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
@@ -269,6 +273,9 @@
 exit 0
 
 %changelog
+* Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-9
+- Fixed the udev rules file (bug #248740, bug #249025).
+
 * Tue Jul 17 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-8
 - Fixed hp-toolbox desktop file (bug #248560).