diff --git a/.cvsignore b/.cvsignore index 66eaa4c..c3046b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -25,3 +25,4 @@ hplip-2.8.5.tar.gz hplip-2.8.6.tar.gz hplip-2.8.6b.tar.gz hplip-2.8.7.tar.gz +hplip-2.8.10.tar.gz diff --git a/hplip-gzip-n.patch b/hplip-gzip-n.patch deleted file mode 100644 index 6d57d34..0000000 --- a/hplip-gzip-n.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up hplip-2.8.6/Makefile.am.gzip-n hplip-2.8.6/Makefile.am ---- hplip-2.8.6/Makefile.am.gzip-n 2008-06-21 00:40:39.000000000 +0100 -+++ hplip-2.8.6/Makefile.am 2008-06-23 12:10:17.000000000 +0100 -@@ -401,8 +401,8 @@ if HPLIP_BUILD - # Install fax support. - if [ "$(fax_build)" = "yes" ]; then \ - mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ -- gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ -- gzip -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \ -+ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ -+ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \ - fi - endif # if HPLIP_BUILD - -diff -up hplip-2.8.6/Makefile.in.gzip-n hplip-2.8.6/Makefile.in ---- hplip-2.8.6/Makefile.in.gzip-n 2008-06-21 00:41:33.000000000 +0100 -+++ hplip-2.8.6/Makefile.in 2008-06-23 12:10:45.000000000 +0100 -@@ -6615,8 +6615,8 @@ install-data-hook: install-foo - # Install fax support. - @HPLIP_BUILD_TRUE@ if [ "$(fax_build)" = "yes" ]; then \ - @HPLIP_BUILD_TRUE@ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ --@HPLIP_BUILD_TRUE@ gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ --@HPLIP_BUILD_TRUE@ gzip -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \ -+@HPLIP_BUILD_TRUE@ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ -+@HPLIP_BUILD_TRUE@ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \ - @HPLIP_BUILD_TRUE@ fi - - install-foo: diff --git a/hplip-quiet.patch b/hplip-quiet.patch deleted file mode 100644 index 718cfd7..0000000 --- a/hplip-quiet.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up hplip-2.8.5/hpssd.py.quiet hplip-2.8.5/hpssd.py ---- hplip-2.8.5/hpssd.py.quiet 2008-05-08 17:26:03.000000000 +0100 -+++ hplip-2.8.5/hpssd.py 2008-06-03 12:07:23.000000000 +0100 -@@ -495,5 +495,4 @@ if __name__ == '__main__': - sys.exit(0) - - -- utils.log_title(__title__, __version__) - sys.exit(run()) diff --git a/hplip-systray.patch b/hplip-systray.patch index 5d87d66..23c58d7 100644 --- a/hplip-systray.patch +++ b/hplip-systray.patch @@ -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 diff --git a/hplip.spec b/hplip.spec index e136760..5501dc3 100644 --- a/hplip.spec +++ b/hplip.spec @@ -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 @@ Url: http://hplip.sourceforge.net/ 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 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # 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 @@ rm -rf %{buildroot} %{_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 @@ fi exit 0 %changelog +* Thu Dec 11 2008 Tim Waugh 2.8.10-1 +- 2.8.10. No longer need gzip-n or quiet patches. + * Thu Dec 11 2008 Tim Waugh 2.8.7-5 - Prevent backend crash when D-Bus not running (bug #474362). diff --git a/sources b/sources index 1b7a65f..56480e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -011593f03603f10259eb2fa41b1d64f2 hplip-2.8.7.tar.gz +a9ad78c4f0d884caac6b176b3cb9bf21 hplip-2.8.10.tar.gz