- Fixed ui-optional patch for qt4 code path (bug #500473).

hplip-ui-optional.patch

@@ -1,8 +1,9 @@
---- hplip-1.7.2/base/utils.py.ui-optional	2007-02-07 19:21:31.000000000 +0000
+diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py
-+++ hplip-1.7.2/base/utils.py	2007-06-11 14:29:16.000000000 +0100
+--- hplip-3.9.6b/base/utils.py.ui-optional	2009-06-25 20:05:53.000000000 +0100
-@@ -644,6 +644,13 @@
++++ hplip-3.9.6b/base/utils.py	2009-07-28 10:10:57.984991878 +0100
-         log.error("PyQt not installed. GUI not available. Exiting.")
+@@ -597,6 +597,13 @@ def checkPyQtImport(): # qt3
-         return False
+         if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
+             no_qt_message_gtk()
  
 +        # hplip-gui sub-package (Fedora)
 +        try:
@@ -11,6 +12,17 @@
 +            log.error("hplip-gui not installed.  GUI not available. Exiting.")
 +            return False
 +
-     # check version of Qt
+         log.error("PyQt not installed. GUI not available. Exiting.")
-     qtMajor = int(qt.qVersion().split('.')[0])
+         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

hplip.spec

@@ -349,6 +349,7 @@ exit 0
 
 %changelog
 * Tue Jul 28 2009 Tim Waugh <twaugh@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).