rpms/hplip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f20' into f21

Browse Source
This commit is contained in:
Tim Waugh 2014-08-26 13:36:51 +01:00
commit 52ab2dce4b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hplip-udev-rules.patch
View File

@ -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

2
hplip.spec
View File

@ -490,8 +490,6 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%changelog
* Tue Aug 26 2014 Tim Waugh <twaugh@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).
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild