From e792436c0ffb3a10e4ecf46fa5b5c41108887373 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Aug 2016 17:42:20 +0200 Subject: [PATCH 1/2] change in patch hplip-ui-optional - message about installing hplip-gui --- hplip-ui-optional.patch | 33 ++++++++++++++++++++++++++++++--- hplip.spec | 5 ++++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch index 0f52c11..fa64da8 100644 --- a/hplip-ui-optional.patch +++ b/hplip-ui-optional.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.16.5/base/utils.py.ui-optional hplip-3.16.5/base/utils.py ---- hplip-3.16.5/base/utils.py.ui-optional 2016-05-04 07:23:22.000000000 +0200 -+++ hplip-3.16.5/base/utils.py 2016-05-19 13:52:28.773907101 +0200 +diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py +--- hplip-3.16.7/base/utils.py.ui-optional 2016-07-15 12:12:28.000000000 +0200 ++++ hplip-3.16.7/base/utils.py 2016-08-12 10:12:24.599398769 +0200 @@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3 if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'): no_qt_message_gtk() @@ -25,3 +25,30 @@ diff -up hplip-3.16.5/base/utils.py.ui-optional hplip-3.16.5/base/utils.py return False return True +@@ -2434,6 +2442,7 @@ def checkPyQtImport45(): + except ImportError as e: + log.debug(e) + ++ log.error("Install the hplip-gui package for graphical support.") + raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed") + + +@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit): + return (QApplication, "ui4") + except ImportError as e: + log.error(e) ++ log.error("Unable to load Qt support. Is hplip-gui package installed?") + sys.exit(1) + elif ui_toolkit == "qt5": + try: +@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit): + return (QApplication, "ui5") + except ImportError as e: + log.error(e) +- sys.exit(1) +- else: +- log.error("Unable to load Qt support. Is it installed?") ++ log.error("Unable to load Qt support. Is hplip-gui package installed?") + sys.exit(1) + + diff --git a/hplip.spec b/hplip.spec index efb3c4a..d2e75e5 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.16.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -462,6 +462,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Mon Aug 22 2016 Zdenek Dohnal - 3.16.7-2 +- change in patch hplip-ui-optional - message about installing hplip-gui + * Thu Jul 21 2016 Zdenek Dohnal - 3.16.7-1 - 1358761 - Rebase 3.16.7 From b15a76a8a919d3e0d8010dd31732726796fbc3d1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 30 Aug 2016 14:42:15 +0200 Subject: [PATCH 2/2] rebase to 3.16.8 --- .gitignore | 1 + hplip-3.16.7.tar.gz.asc | 7 ------- hplip-3.16.8.tar.gz.asc | 7 +++++++ hplip.spec | 7 +++++-- sources | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 hplip-3.16.7.tar.gz.asc create mode 100644 hplip-3.16.8.tar.gz.asc diff --git a/.gitignore b/.gitignore index eacab00..ee98e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ hplip-3.10.6.tar.gz /hplip-3.16.3.tar.gz /hplip-3.16.5.tar.gz /hplip-3.16.7.tar.gz +/hplip-3.16.8.tar.gz diff --git a/hplip-3.16.7.tar.gz.asc b/hplip-3.16.7.tar.gz.asc deleted file mode 100644 index 3d005f3..0000000 --- a/hplip-3.16.7.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAleIt5UACgkQc9dwzaWQR7nvbwCfeqKojiO4//25a6L0qHSIMEMO -XoMAoNQ2o4yKJj8lf5oNX/0Vr0o0n0S6 -=SniU ------END PGP SIGNATURE----- diff --git a/hplip-3.16.8.tar.gz.asc b/hplip-3.16.8.tar.gz.asc new file mode 100644 index 0000000..200bf1e --- /dev/null +++ b/hplip-3.16.8.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlfAFeQACgkQc9dwzaWQR7lP7gCgrcXWt3IcwXLNhyUUEZfBXKSP +rFIAoJbUJlX6p8jmV8bKpMQEekUyWpwO +=U4th +-----END PGP SIGNATURE----- diff --git a/hplip.spec b/hplip.spec index d2e75e5..6dd2b34 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.16.7 -Release: 2%{?dist} +Version: 3.16.8 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -462,6 +462,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Aug 30 2016 Zdenek Dohnal - 3.16.8-1 +- rebase to 3.16.8 + * Mon Aug 22 2016 Zdenek Dohnal - 3.16.7-2 - change in patch hplip-ui-optional - message about installing hplip-gui diff --git a/sources b/sources index fcf759a..cca660a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4982fd71549f45856b5ad76e1ae8809 hplip-3.16.7.tar.gz +3e62c8ce740a4b40e1bf9ab1440f3ad5 hplip-3.16.8.tar.gz