diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch new file mode 100644 index 0000000..49cb808 --- /dev/null +++ b/hplip-udev-rules.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules +--- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 ++++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 +@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + LABEL="pid_test" + + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + +-LABEL="hpmud_rules_end" +\ No newline at end of file ++LABEL="hpmud_rules_end" diff --git a/hplip.spec b/hplip.spec index 70e7530..382d1b4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -19,6 +19,7 @@ Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch +Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -134,6 +135,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # directly (bug #552572). %patch6 -p1 -b .mucks-with-spooldir +# Removed SYSFS use in udev rules and actually made them work +# (bug #560754). +%patch7 -p1 -b .udev-rules + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -363,6 +368,8 @@ fi %changelog * Mon Mar 1 2010 Tim Waugh - 3.10.2-2 +- Removed SYSFS use in udev rules and actually made them work + (bug #560754). - Use a temporary file in pstotiff to allow gs random access. * Fri Feb 26 2010 Tim Waugh - 3.10.2-1