Accepting request 741595 from Printing

- Added missing requirement lsb-release (needed for root password
  prompt, e.g. hp-plugin).
- Changed the pgp server to pool.sks-keyservers.net to avoid timeouts
  from pgp.mit.edu
  * New patch: hplip-change-pgp-server.patch

OBS-URL: https://build.opensuse.org/request/show/741595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger 2019-10-22 13:44:02 +00:00 committed by Git OBS Bridge
commit 403349a3a1
3 changed files with 28 additions and 0 deletions

View File

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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Oct 16 07:48:29 UTC 2019 - Andreas Schneider <asn@cryptomilk.org>
- Added missing requirement lsb-release (needed for root password
prompt, e.g. hp-plugin).
- Changed the pgp server to pool.sks-keyservers.net to avoid timeouts
from pgp.mit.edu
* New patch: hplip-change-pgp-server.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 29 20:33:04 UTC 2019 - Martin Wilck <mwilck@suse.com> Thu Aug 29 20:33:04 UTC 2019 - Martin Wilck <mwilck@suse.com>

View File

@ -76,6 +76,9 @@ Patch303: photocard-fix-import-error-for-pcardext.patch
Patch400: hplip-remove-imageprocessor.diff Patch400: hplip-remove-imageprocessor.diff
# Let a function return NULL instead of nothing # Let a function return NULL instead of nothing
Patch401: hplip-orblite-return-null.diff 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 devel}
BuildRequires: %{pymod qt5-devel} BuildRequires: %{pymod qt5-devel}
BuildRequires: %{pymod xml} BuildRequires: %{pymod xml}
@ -137,6 +140,8 @@ Requires: cups > 1.5
# to get "all the HPLIP stuff" installed has the RPM requirement: # to get "all the HPLIP stuff" installed has the RPM requirement:
Requires: foomatic-filters Requires: foomatic-filters
Requires: ghostscript Requires: ghostscript
# hp-plugin requries lsb_release
Requires: lsb-release
Requires(post): %{_bindir}/find Requires(post): %{_bindir}/find
Requires(post): /bin/grep Requires(post): /bin/grep
Requires(post): /bin/sed Requires(post): /bin/sed
@ -304,6 +309,7 @@ This sub-package is only required by developers.
%patch303 -p1 -b .photocard_import %patch303 -p1 -b .photocard_import
%patch400 -p1 %patch400 -p1
%patch401 -p1 %patch401 -p1
%patch402 -p1
# replace "env" shebang and "/usr/bin/python" with real executable # replace "env" shebang and "/usr/bin/python" with real executable
find . -name '*.py' -o -name pstotiff | \ find . -name '*.py' -o -name pstotiff | \