From f94aa7b00b01a36f666c258e3b0247b2f590876f35b738d0565fbc67dabd72b0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Mon, 21 Oct 2019 15:43:15 +0000
Subject: [PATCH] Accepting request 738821 from home:gladiac:branches:Printing

- Add missing requries to lsb-release
- Change the pgp server to pool.sks-keyservers.net

OBS-URL: https://build.opensuse.org/request/show/738821
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=179
---
 hplip-change-pgp-server.patch | 13 +++++++++++++
 hplip.changes                 |  6 ++++++
 hplip.spec                    |  6 ++++++
 3 files changed, 25 insertions(+)
 create mode 100644 hplip-change-pgp-server.patch

diff --git a/hplip-change-pgp-server.patch b/hplip-change-pgp-server.patch
new file mode 100644
index 0000000..487b416
--- /dev/null
+++ b/hplip-change-pgp-server.patch
@@ -0,0 +1,13 @@
+Index: hplip-3.19.6/base/validation.py
+===================================================================
+--- hplip-3.19.6.orig/base/validation.py	2019-06-26 15:07:10.000000000 +0200
++++ hplip-3.19.6/base/validation.py	2019-10-16 09:53:51.966435988 +0200
+@@ -42,7 +42,7 @@ class DigiSign_Verification(object):
+ 
+ 
+ class GPG_Verification(DigiSign_Verification):
+-    def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
++    def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
+         self.__pgp_site = pgp_site
+         self.__key = key
+         self.__gpg = utils.which('gpg',True)
diff --git a/hplip.changes b/hplip.changes
index c5e9b9b..ddf44af 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 16 07:48:29 UTC 2019 - Andreas Schneider <asn@cryptomilk.org>
+
+- Add missing requries to lsb-release
+- Change the pgp server to pool.sks-keyservers.net
+
 -------------------------------------------------------------------
 Thu Aug 29 20:33:04 UTC 2019 - Martin Wilck <mwilck@suse.com>
 
diff --git a/hplip.spec b/hplip.spec
index a7ad1a8..2a2b78e 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -76,6 +76,9 @@ Patch303:       photocard-fix-import-error-for-pcardext.patch
 Patch400:       hplip-remove-imageprocessor.diff
 # Let a function return NULL instead of nothing
 Patch401:       hplip-orblite-return-null.diff
+# Use a pgp server (pool.sks-keyservers.net) which doesn't throw proxy errors
+# or run into timeouts most of the time
+Patch402:       hplip-change-pgp-server.patch
 BuildRequires:  %{pymod devel}
 BuildRequires:  %{pymod qt5-devel}
 BuildRequires:  %{pymod xml}
@@ -137,6 +140,8 @@ Requires:       cups > 1.5
 # to get "all the HPLIP stuff" installed has the RPM requirement:
 Requires:       foomatic-filters
 Requires:       ghostscript
+# hp-plugin requries lsb_release
+Requires:       lsb-release
 Requires(post): %{_bindir}/find
 Requires(post): /bin/grep
 Requires(post): /bin/sed
@@ -304,6 +309,7 @@ This sub-package is only required by developers.
 %patch303 -p1 -b .photocard_import
 %patch400 -p1
 %patch401 -p1
+%patch402 -p1
 
 # replace "env" shebang and "/usr/bin/python" with real executable
 find . -name '*.py' -o -name pstotiff | \