[hplip/f20] Revert "Updated udev-rules patch so that firmware is reloaded on demand (bug #1033952)."

[Tim Waugh]

commit 6d7b6c9db8969dcc3d7078e3c8b668c87aaf2baa
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 26 13:35:08 2014 +0100

    Revert "Updated udev-rules patch so that firmware is reloaded on demand (bug #1033952)."
    
    This reverts commit 298dff827d0526671e16f6a107153daa5e2ab40f.
    
    The hp-config_usb_printer command isn't shipped, so we'd need to ship
    that along side the udev rules. Unfortunately, the udev rules are
    located in hplip-common, but hp-config_usb_printer has all sorts of
    dependencies on the main hplip package.
    
    Will need some more thinking about.

 hplip-udev-rules.patch |   13 +++++++++++++
 hplip.spec             |    2 --
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 206e786..37de4e1 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,3 +1,16 @@
+diff -up hplip-3.14.3/data/rules/56-hpmud.rules.udev-rules hplip-3.14.3/data/rules/56-hpmud.rules
+--- hplip-3.14.3/data/rules/56-hpmud.rules.udev-rules	2014-03-07 10:06:30.338946358 +0100
++++ hplip-3.14.3/data/rules/56-hpmud.rules	2014-03-07 10:10:25.004683464 +0100
+@@ -11,9 +11,6 @@ LABEL="hpmud_usb_rules"
+ ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
+ 
+ 
+-# This rule will add the printer and install plugin
+-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'"
+-
+ # If sane-bankends is installed add hpaio backend support to dll.conf if needed.
+ ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
+ 
 diff -up hplip-3.14.3/Makefile.in.udev-rules hplip-3.14.3/Makefile.in
 --- hplip-3.14.3/Makefile.in.udev-rules	2014-03-06 06:11:18.000000000 +0100
 +++ hplip-3.14.3/Makefile.in	2014-03-07 10:06:30.341946316 +0100
diff --git a/hplip.spec b/hplip.spec
index 86946ed..287960d 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -490,8 +490,6 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %changelog
 * Tue Aug 26 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-7
 - Reverted previous change as it didn't help (bug #1076954).
-- Updated udev-rules patch so that firmware is reloaded on demand, now
-  the command to do it just does that (bug #1033952).
 
 * Wed Jul 23 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-6
 - Potential fix for lineart scanning (bug #1076954).