From 6bab420ff26b5407fa15a998cf2107c6fbc6902e Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 20 Jul 2007 13:25:43 +0000
Subject: [PATCH] - Fixed the udev rules file (bug #248740, bug #249025).

---
 hplip-udev-rules.patch | 12 ++++++++++++
 hplip.spec             |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 hplip-udev-rules.patch

diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
new file mode 100644
index 0000000..6f60a10
--- /dev/null
+++ b/hplip-udev-rules.patch
@@ -0,0 +1,12 @@
+--- 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"
diff --git a/hplip.spec b/hplip.spec
index c68b1e4..a2ceef1 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -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 @@ Patch2: hplip-guest.patch
 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 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # 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 @@ fi
 exit 0
 
 %changelog
+* Fri Jul 20 2007 Tim Waugh <twaugh@redhat.com> 2.7.6-9
+- Fixed the udev rules file (bug #248740, bug #249025).
+
 * Tue Jul 17 2007 Tim Waugh <twaugh@redhat.com> 2.7.6-8
 - Fixed hp-toolbox desktop file (bug #248560).