rpms/hplip/devel .cvsignore, 1.28, 1.29 hplip-systray.patch, 1.1, 1.2 hplip.spec, 1.189, 1.190 sources, 1.28, 1.29 hplip-gzip-n.patch, 1.2, NONE hplip-quiet.patch, 1.5, NONE

Thu Dec 11 12:21:33 UTC 2008

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8046

Modified Files:
	.cvsignore hplip-systray.patch hplip.spec sources 
Removed Files:
	hplip-gzip-n.patch hplip-quiet.patch 
Log Message:
* Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.10-1
- 2.8.10.  No longer need gzip-n or quiet patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29

--- .cvsignore	4 Aug 2008 17:16:20 -0000	1.28
+++ .cvsignore	11 Dec 2008 12:21:02 -0000	1.29
@@ -25,3 +25,4 @@
 hplip-2.8.6.tar.gz
 hplip-2.8.6b.tar.gz
 hplip-2.8.7.tar.gz
+hplip-2.8.10.tar.gz

hplip-systray.patch:

Index: hplip-systray.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-systray.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-systray.patch	6 Jun 2008 07:25:16 -0000	1.1
+++ hplip-systray.patch	11 Dec 2008 12:21:02 -0000	1.2
@@ -1,28 +1,13 @@
-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)
+diff -up hplip-2.8.10/base/module.py.systray hplip-2.8.10/base/module.py
+--- hplip-2.8.10/base/module.py.systray	2008-12-11 12:05:42.000000000 +0000
++++ hplip-2.8.10/base/module.py	2008-12-11 12:05:46.000000000 +0000
+@@ -57,7 +57,7 @@ class Module(object):
  
-         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)
-         
+         self.avail_modes = avail_modes
+         self.supported_ui_toolkits = supported_ui_toolkits
+-        self.default_ui_toolkit = sys_cfg.configure.get('ui-toolkit', 'qt3')
++        self.default_ui_toolkit = sys_cfg.configure.get('ui-toolkit', 'qt4')
+ 
+         self.default_mode = INTERACTIVE_MODE
+ 
+diff -up hplip-2.8.10/systray.py.systray hplip-2.8.10/systray.py


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- hplip.spec	11 Dec 2008 11:13:33 -0000	1.189
+++ hplip.spec	11 Dec 2008 12:21:02 -0000	1.190
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.8.7
-Release: 5%{?dist}
+Version: 2.8.10
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -15,8 +15,6 @@
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
-Patch2: hplip-gzip-n.patch
-Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
@@ -106,12 +104,6 @@
 # Fix desktop file.
 %patch1 -p1 -b .desktop
 
-# Avoid multilib conflict (bug #341531).
-%patch2 -p1 -b .gzip-n
-
-# Quieten hpssd on startup.
-%patch3 -p1 -b .quiet
-
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
@@ -220,7 +212,6 @@
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
-%{_datadir}/hplip/dat2drv.py*
 %{_datadir}/hplip/fab.py*
 %{_datadir}/hplip/fax
 %{_datadir}/hplip/firmware.py*
@@ -310,6 +301,9 @@
 exit 0
 
 %changelog
+* Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.10-1
+- 2.8.10.  No longer need gzip-n or quiet patches.
+
 * Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-5
 - Prevent backend crash when D-Bus not running (bug #474362).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Aug 2008 17:16:20 -0000	1.28
+++ sources	11 Dec 2008 12:21:02 -0000	1.29
@@ -1 +1 @@
-011593f03603f10259eb2fa41b1d64f2  hplip-2.8.7.tar.gz
+a9ad78c4f0d884caac6b176b3cb9bf21  hplip-2.8.10.tar.gz


--- hplip-gzip-n.patch DELETED ---


--- hplip-quiet.patch DELETED ---


