rpms/hplip/F-11 hplip-ui-optional.patch, 1.1, 1.2 hplip.spec, 1.209, 1.210
Tim Waugh
twaugh at fedoraproject.org
Tue Jul 28 09:18:05 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31052
Modified Files:
hplip-ui-optional.patch hplip.spec
Log Message:
* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-3
- Fixed ui-optional patch for qt4 code path (bug #500473).
hplip-ui-optional.patch:
utils.py | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: hplip-ui-optional.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-ui-optional.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-ui-optional.patch 11 Jun 2007 14:53:16 -0000 1.1
+++ hplip-ui-optional.patch 28 Jul 2009 09:18:05 -0000 1.2
@@ -1,16 +1,28 @@
---- hplip-1.7.2/base/utils.py.ui-optional 2007-02-07 19:21:31.000000000 +0000
-+++ hplip-1.7.2/base/utils.py 2007-06-11 14:29:16.000000000 +0100
-@@ -644,6 +644,13 @@
- log.error("PyQt not installed. GUI not available. Exiting.")
- return False
+diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py
+--- hplip-3.9.6b/base/utils.py.ui-optional 2009-06-25 20:05:53.000000000 +0100
++++ hplip-3.9.6b/base/utils.py 2009-07-28 10:10:57.984991878 +0100
+@@ -597,6 +597,13 @@ def checkPyQtImport(): # qt3
+ if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
+ no_qt_message_gtk()
-+ # hplip-gui sub-package (Fedora)
-+ try:
-+ import ui
-+ except ImportError:
-+ log.error("hplip-gui not installed. GUI not available. Exiting.")
-+ return False
++ # hplip-gui sub-package (Fedora)
++ try:
++ import ui
++ except ImportError:
++ log.error("hplip-gui not installed. GUI not available. Exiting.")
++ return False
+
- # check version of Qt
- qtMajor = int(qt.qVersion().split('.')[0])
+ log.error("PyQt not installed. GUI not available. Exiting.")
+ return False
+@@ -642,7 +649,10 @@ def checkPyQtImport(): # qt3
+ def checkPyQtImport4():
+ try:
+ import PyQt4
++ import ui4
+ except ImportError:
++ # hplip-gui sub-package (Fedora) requires PyQt4
++ log.error("Install the hplip-gui package for graphical support.")
+ return False
+ else:
+ return True
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- hplip.spec 28 Jul 2009 08:59:54 -0000 1.209
+++ hplip.spec 28 Jul 2009 09:18:05 -0000 1.210
@@ -349,6 +349,7 @@ exit 0
%changelog
* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-3
+- Fixed ui-optional patch for qt4 code path (bug #500473).
- Fixed HWResolution for 'Normal' output from the hpcups driver
(laundpad bug #405400).
More information about the scm-commits
mailing list