rpms/hplip/devel hplip-systray.patch, NONE, 1.1 hplip.spec, 1.178, 1.179

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22370

Modified Files:
	hplip.spec 
Added Files:
	hplip-systray.patch 
Log Message:
* Fri Jun  6 2008 Tim Waugh <twaugh at redhat.com> 2.8.5-2
- Make --qt4 the default for the systray applet, so that it appears
  in the right place.  Requires PyQt4.


hplip-systray.patch:

--- NEW FILE hplip-systray.patch ---
diff -up hplip-2.8.5/systray.py.systray hplip-2.8.5/systray.py
--- hplip-2.8.5/systray.py.systray	2008-06-06 08:15:34.000000000 +0100
+++ hplip-2.8.5/systray.py	2008-06-06 08:20:49.000000000 +0100
@@ -38,8 +38,8 @@ from prnt import cups
 USAGE = [(__doc__, "", "name", True),
          ("Usage: hp-systray [OPTIONS]", "", "summary", True),
          utils.USAGE_OPTIONS,
-         ("Force Qt3:", "--qt3 (default)", "option", False),
-         ("Force Qt4:", "--qt4", "option", False),
+         ("Force Qt3:", "--qt3", "option", False),
+         ("Force Qt4:", "--qt4 (default)", "option", False),
          ("Startup even if no hplip CUPS queues are present:", "-x or --force-startup", "option", False),
          utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3,
          utils.USAGE_HELP,
@@ -135,11 +135,11 @@ if __name__ == '__main__':
         os.close(w)
 
         try:
-            if force_qt3 or (not force_qt3 and not force_qt4):
+            if force_qt3:
                 from ui import systemtray_qt3
                 systemtray_qt3.run(r, child_pid)
     
-            elif force_qt4:
+            elif force_qt4 or (not force_qt3 and not force_qt4):
                 from ui import systemtray_qt4
                 systemtray_qt4.run(r, child_pid)
         


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- hplip.spec	3 Jun 2008 14:07:18 -0000	1.178
+++ hplip.spec	6 Jun 2008 07:25:16 -0000	1.179
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,6 +19,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
+Patch6: hplip-systray.patch
 Patch8: hplip-libsane.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -54,6 +55,7 @@
 Group: Applications/System
 License: BSD
 Requires: PyQt
+Requires: PyQt4
 Requires(post): desktop-file-utils >= 0.2.92
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
@@ -107,6 +109,10 @@
 # libhpip should link against libm (bug #197599).
 %patch5 -p1 -b .libm
 
+# Make --qt4 the default for the systray applet, so that it appears
+# in the right place.
+%patch6 -p1 -b .systray
+
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
@@ -285,6 +291,10 @@
 exit 0
 
 %changelog
+* Fri Jun  6 2008 Tim Waugh <twaugh at redhat.com> 2.8.5-2
+- Make --qt4 the default for the systray applet, so that it appears
+  in the right place.  Requires PyQt4.
+
 * Tue Jun  3 2008 Tim Waugh <twaugh at redhat.com> 2.8.5-1
 - 2.8.5.
 - Configure with --enable-dbus.  Build requires dbus-devel.