rebase to 3.17.4

.gitignore

@@ -80,3 +80,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.16.9.tar.gz
 /hplip-3.16.10.tar.gz
 /hplip-3.16.11.tar.gz
+/hplip-3.17.4.tar.gz

hplip-3.16.11.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlg1MY8ACgkQc9dwzaWQR7nK8QCfT+tt+tvxPFv0XNOJ+9lRLkru
-W/cAoIbp9Y+MohGJXH98Tx8bspwJp5US
-=ncx7
------END PGP SIGNATURE-----

hplip-3.17.4.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAljty0kACgkQc9dwzaWQR7mRAwCcCeOnZPH22yBMH8TKVCAk5vRC
+tmQAn3uTUnklynBYgqC18ZuHQYhMw1+h
+=UQnM
+-----END PGP SIGNATURE-----

hplip-badwhitespace.patch

@@ -1,18 +0,0 @@
-diff -up hplip-3.16.8/prnt/filters/hpps.badwhitespace hplip-3.16.8/prnt/filters/hpps
---- hplip-3.16.8/prnt/filters/hpps.badwhitespace	2016-09-01 19:15:43.509068772 +0200
-+++ hplip-3.16.8/prnt/filters/hpps	2016-09-01 19:32:47.861548645 +0200
-@@ -197,11 +197,11 @@ if 'HPPinPrnt' in options and 'noHPPinPr
-             msg("Setting Pin to default")
-     else:
-         szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']                                 
--	for x in szKeyInitials:
-+        for x in szKeyInitials:
-            try:
--	        secpin += opts[x]
-+                secpin += opts[x]
-            except KeyError:
--	        secpin += '0'
-+                secpin += '0'
- 
-     os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
- 

hplip.spec

@@ -12,8 +12,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.16.11
+Version: 3.17.4
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplipopensource.com/
@@ -43,8 +43,7 @@ Patch21: hplip-strncpy.patch
 Patch22: hplip-no-write-bytecode.patch
 Patch23: hplip-silence-ioerror.patch
 Patch24: hplip-3165-sourceoption.patch
-Patch25: hplip-badwhitespace.patch
+Patch25: hplip-noernie.patch
-Patch26: hplip-noernie.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -224,11 +223,8 @@ done
 # [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
 %patch24 -p1 -b .sourceoption
 
-# Bad whitespaces (bug #1372343)
-%patch25 -p1 -b .badwhitespace
-
 # hplip license problem (bug #1364711)
-%patch26 -p1 -b .no-ernie
+%patch25 -p1 -b .no-ernie
 
 rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 
@@ -494,6 +490,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 24 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.4-1
+- rebase to 3.17.4
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1 +1 @@
-7d187c3142ba323a3021767d333ad9f4  hplip-3.16.11.tar.gz
+SHA512 (hplip-3.17.4.tar.gz) = ea295502df5b6c44839a7c03a725dc7475d256994eac2a7950058a68c805ca4942611df2688384c8acbc6551009841bb4623e7a3e7c8c0b16f44a2215a7316e6