- 2.8.10. No longer need gzip-n or quiet patches.
This commit is contained in:
Tim Waugh
parent
90831de7d0
commit
919a179820
@ -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
|
||||
|
||||
@ -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:
|
||||
@ -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())
|
||||
@ -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
|
||||
|
||||
16
hplip.spec
16
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 <twaugh@redhat.com> 2.8.10-1
|
||||
- 2.8.10. No longer need gzip-n or quiet patches.
|
||||
|
||||
* Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.7-5
|
||||
- Prevent backend crash when D-Bus not running (bug #474362).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user