correcting previous commit

This commit is contained in:
Zdenek Dohnal 2016-08-10 18:41:50 +02:00
commit 6b743c52e0
3 changed files with 15 additions and 19 deletions

View File

@ -1,11 +0,0 @@
diff -up hplip-3.16.7/base/utils.py.setup-errm hplip-3.16.7/base/utils.py
--- hplip-3.16.7/base/utils.py.setup-errm 2016-08-10 16:33:06.781765887 +0200
+++ hplip-3.16.7/base/utils.py 2016-08-10 16:33:27.060588323 +0200
@@ -789,6 +789,7 @@ def checkPyQtImport4():
except ImportError:
import PyQt5
import ui5
+ log.error("Install the hplip-gui package for graphical support.")
else:
# hplip-gui sub-package (Fedora) requires python3-qt5
log.error("Install the hplip-gui package for graphical support.")

View File

@ -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-10 18:02:25.126595787 +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,11 @@ 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")

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.16.7
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/
@ -39,7 +39,6 @@ Patch23: hplip-silence-ioerror.patch
Patch24: hplip-3165-sourceoption.patch
Patch25: hplip-include-ppdh.patch
Patch26: hplip-noernie.patch
Patch27: hplip-setup-errm.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow
@ -220,9 +219,6 @@ done
# hplip license problem (bug #1364711)
%patch26 -p1 -b .no-ernie
# adding error message when hp-setup fail because of missing hplip-gui (bug #1361968)
%patch27 -p1 -b .setup-errm
rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
sed -i.duplex-constraints \
@ -476,6 +472,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Wed Aug 10 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-3
- editing previous commit
* Wed Aug 10 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-2
- 1361968 - adding error message when hp-setup fails because of missing hplip-gui