Merge branch 'f19' into f20

.gitignore

@@ -65,3 +65,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.14.3.tar.gz
 /hplip-3.14.4.tar.gz
 /hplip-3.14.6.tar.gz
+/hplip-3.14.10.tar.gz

hplip-3.14.10.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlQzq2kACgkQc9dwzaWQR7kFZwCfVxHaORmTNA7jyexSGPKrXGoY
+bWIAnjTK/xMAsx0un81KEWS/h2GFyB9V
+=Vbpn
+-----END PGP SIGNATURE-----

hplip-3.14.6.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlONbUsACgkQc9dwzaWQR7nu0gCgpq2dT7qvrkIbaIarjUdX+EbC
-F5UAn3C6ZjcYma+F2hAuqC4973F6fAf1
-=cteQ
------END PGP SIGNATURE-----

hplip-udev-rules.patch

@@ -1,20 +1,21 @@
-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"
+diff -up hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules hplip-3.14.10/data/rules/56-hpmud.rules
+--- hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules	2014-10-07 15:58:17.081756602 +0200
++++ hplip-3.14.10/data/rules/56-hpmud.rules	2014-10-07 16:01:21.372127237 +0200
+@@ -10,10 +10,6 @@ LABEL="hpmud_usb_rules"
+ # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
  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
+-
+-# This rule will check the smart install feature, plugin status and firmware download for the required printers.
 -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
-@@ -4442,7 +4442,7 @@ cups_drv = prnt/drv/hpcups.drv
+diff -up hplip-3.14.10/Makefile.in.udev-rules hplip-3.14.10/Makefile.in
+--- hplip-3.14.10/Makefile.in.udev-rules	2014-10-07 10:56:30.000000000 +0200
++++ hplip-3.14.10/Makefile.in	2014-10-07 15:58:17.084756560 +0200
+@@ -4550,7 +4550,7 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
  
  # hpmud.rules

hplip.spec

@@ -6,8 +6,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.14.6
-Release: 7%{?dist}
+Version: 3.14.10
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 
 Url: http://hplip.sourceforge.net/
@@ -488,6 +488,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 07 2014 Jiri Popelka <jpopelka@redhat.com> - 3.14.10-1
+- 3.14.10
+
 * Tue Aug 26 2014 Tim Waugh <twaugh@redhat.com> - 3.14.6-7
 - Reverted previous change as it didn't help (bug #1076954).
 

sources

@@ -1 +1 @@
-ec14b3bf3ac17a7c00b96e51d4c38114  hplip-3.14.6.tar.gz
+7af44ee1c4312b00d2269c1b25008f73  hplip-3.14.10.tar.gz