From 1bac50959be6166f244f12e744ed1b4c2a09d25e Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 24 Apr 2017 08:52:13 +0200
Subject: [PATCH] rebase to 3.17.4

---
 .gitignore                |  1 +
 hplip-3.16.11.tar.gz.asc  |  7 -------
 hplip-3.17.4.tar.gz.asc   |  7 +++++++
 hplip-badwhitespace.patch | 18 ------------------
 hplip.spec                | 13 ++++++-------
 sources                   |  2 +-
 6 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 hplip-3.16.11.tar.gz.asc
 create mode 100644 hplip-3.17.4.tar.gz.asc
 delete mode 100644 hplip-badwhitespace.patch

diff --git a/.gitignore b/.gitignore
index 3d38217..fc3293f 100644
--- a/.gitignore
+++ b/.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
diff --git a/hplip-3.16.11.tar.gz.asc b/hplip-3.16.11.tar.gz.asc
deleted file mode 100644
index 38ded28..0000000
--- a/hplip-3.16.11.tar.gz.asc
+++ /dev/null
@@ -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-----
diff --git a/hplip-3.17.4.tar.gz.asc b/hplip-3.17.4.tar.gz.asc
new file mode 100644
index 0000000..8e26b97
--- /dev/null
+++ b/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-----
diff --git a/hplip-badwhitespace.patch b/hplip-badwhitespace.patch
deleted file mode 100644
index 16b03fe..0000000
--- a/hplip-badwhitespace.patch
+++ /dev/null
@@ -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))
- 
diff --git a/hplip.spec b/hplip.spec
index d9344f3..8ee63c5 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,13 +7,13 @@
 # Hp-plugin-check is a switch, which allows testing if new hp-plugin is already available - SET TO 1 ONLY FOR LOCAL BUILDS WHEN REBASING,
 # NO COMMITS WITH HPPLUGINCHECK 1 (lately HP ships new plugins a few days after new release, which makes hp-plugin non-functional 
 # during this time). Any other time it should be set to 0.
-%define hpplugincheck 0
+%define hpplugincheck 1
 %define urlplugin http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/%{name}-%{version}-plugin.run
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.16.11
-Release: 5%{?dist}
+Version: 3.17.4
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -43,7 +43,6 @@ Patch21: hplip-strncpy.patch
 Patch22: hplip-no-write-bytecode.patch
 Patch23: hplip-silence-ioerror.patch
 Patch24: hplip-3165-sourceoption.patch
-Patch25: hplip-badwhitespace.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -223,9 +222,6 @@ 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
-
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -488,6 +484,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 Jan 13 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.11-5
 - reverting previous commit
 
diff --git a/sources b/sources
index 95d62f9..6be314f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d187c3142ba323a3021767d333ad9f4  hplip-3.16.11.tar.gz
+SHA512 (hplip-3.17.4.tar.gz) = ea295502df5b6c44839a7c03a725dc7475d256994eac2a7950058a68c805ca4942611df2688384c8acbc6551009841bb4623e7a3e7c8c0b16f44a2215a7316e6