From 9fb915ebe1215ade8173b773bdae7e9adaad00ed Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 11 Jun 2007 14:53:16 +0000
Subject: [PATCH] - 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 | 16 ++++++++++++++++
 hplip.spec              | 13 +++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 hplip-ui-optional.patch

diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch
new file mode 100644
index 0000000..897a236
--- /dev/null
+++ b/hplip-ui-optional.patch
@@ -0,0 +1,16 @@
+--- 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])
+ 
diff --git a/hplip.spec b/hplip.spec
index 870bd07..4f44a79 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -25,6 +25,7 @@ Patch9: hplip-media-empty.patch
 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 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # 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 @@ rm -rf %{buildroot}
 %{_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 @@ rm -rf %{buildroot}
 %{_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 @@ rm -rf %{buildroot}
 
 %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 @@ fi
 exit 0
 
 %changelog
+* Mon Jun 11 2007 Tim Waugh <twaugh@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@redhat.com>
 - Moved hp-setup to the ui package (bug #243273).
 - Prevent SELinux audit message from the CUPS backends (bug #241776)