rpms/hplip/F-7 hplip-ui-optional.patch, NONE, 1.1 hplip.spec, 1.129, 1.130

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163

Modified Files:
	hplip.spec 
Added Files:
	hplip-ui-optional.patch 
Log Message:
* Mon Jun 11 2007 Tim Waugh <twaugh at redhat.com>
- Moved hp-setup back to the base package, and put code in
  utils.checkPyQtImport() to check for the gui sub-package as well as
  PyQt (bug #243273).


hplip-ui-optional.patch:

--- NEW FILE hplip-ui-optional.patch ---
--- 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
 
+    # 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])
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- hplip.spec	8 Jun 2007 11:35:33 -0000	1.129
+++ hplip.spec	11 Jun 2007 14:16:19 -0000	1.130
@@ -25,6 +25,7 @@
 Patch10: hplip-faxing-with-low-supplies.patch
 Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
+Patch13: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires(post): /sbin/service
@@ -120,6 +121,9 @@
 # Prevent SELinux audit message from the CUPS backends (bug #241776)
 %patch12 -p1 -b .no-root-config
 
+# Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
+%patch13 -p1 -b .ui-optional
+
 autoconf # for patch4
 
 %build
@@ -196,6 +200,7 @@
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-probe
 %{_bindir}/hp-sendfax
+%{_bindir}/hp-setup
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
@@ -222,6 +227,7 @@
 %{_datadir}/hplip/makeuri
 %{_datadir}/hplip/probe
 %{_datadir}/hplip/sendfax
+%{_datadir}/hplip/setup
 %{_datadir}/hplip/testpage
 %{_datadir}/hplip/timedate
 %{_datadir}/hplip/unload
@@ -242,12 +248,10 @@
 
 %files gui
 %{_bindir}/hp-print
-%{_bindir}/hp-setup
 %{_bindir}/hp-toolbox
 # Files
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/print
-%{_datadir}/hplip/setup
 %{_datadir}/hplip/toolbox
 # Directories
 %{_datadir}/hplip/ui
@@ -295,6 +299,11 @@
 exit 0
 
 %changelog
+* Mon Jun 11 2007 Tim Waugh <twaugh at redhat.com>
+- Moved hp-setup back to the base package, and put code in
+  utils.checkPyQtImport() to check for the gui sub-package as well as
+  PyQt (bug #243273).
+
 * Fri Jun  8 2007 Tim Waugh <twaugh at redhat.com>
 - Moved hp-setup to the ui package (bug #243273).