rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f12' into f13

Browse Source
This commit is contained in:
Tim Waugh 2010-08-25 12:11:39 +01:00
commit 62a88db90c
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hplip-fax-ppd.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up hplip-3.10.6/ui/setupform.py.fax-ppd hplip-3.10.6/ui/setupform.py
--- hplip-3.10.6/ui/setupform.py.fax-ppd 2010-08-12 13:08:01.846853509 +0100
+++ hplip-3.10.6/ui/setupform.py 2010-08-12 13:08:17.813979176 +0100
@@ -886,13 +886,13 @@ class SetupForm(SetupForm_base):
QApplication.setOverrideCursor(QApplication.waitCursor)
if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL:
- fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+ fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
nick = "HP Fax 3"
if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP:
- fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+ fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
nick = "HP Fax 2"
else:
- fax_ppd_name = "HP-Fax-hplip" # Standard
+ fax_ppd_name = "HP-Fax-hpcups" # Standard
nick = "HP Fax"
ppds = []

17
hplip-snmp-quirks.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.10.5/prnt/drv/hpcups.drv.in
--- hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks 2010-06-09 16:14:58.240019141 +0100
+++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-06-09 16:15:06.492145617 +0100
@@ -5261,6 +5261,8 @@ Manufacturer "HP"
diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.10.6/prnt/drv/hpcups.drv.in
--- hplip-3.10.6/prnt/drv/hpcups.drv.in.snmp-quirks 2010-08-20 18:03:46.026041759 +0100
+++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-08-20 18:04:26.210041811 +0100
@@ -5318,6 +5318,8 @@ Manufacturer "HP"
Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
@ -10,3 +10,12 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.10.5/prnt/drv/h
PCFileName "hp-officejet_pro_8500_a909g.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)"
}
@@ -5326,6 +5328,8 @@ Manufacturer "HP"
Attribute "NickName" "" "HP Officejet Pro 8500 a909a, $Version"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
+ // This device lies about its supplies capacity.
+ Attribute "cupsSNMPQuirks" "" "capacity"
PCFileName "hp-officejet_pro_8500_a909a.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
}

12
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.6
Release: 1%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -28,6 +28,7 @@ Patch11: hplip-device-reconnected.patch
Patch12: hplip-clear-old-state-reasons.patch
Patch13: hplip-env-python.patch
Patch14: hplip-hpcups-sigpipe.patch
Patch15: hplip-fax-ppd.patch
Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-deviceIDs-ppd.patch
Patch18: hplip-skip-blank-lines.patch
@ -178,6 +179,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Avoid busy loop in hpcups when backend has exited (bug #525944).
%patch14 -p1 -b .hpcups-sigpipe
# Use correct fax PPD name for Qt3 UI.
%patch15 -p1 -b .fax-ppd
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
%patch16 -p1 -b .bad-low-ink-warning
@ -446,6 +450,12 @@ fi
%{_bindir}/hpcups-update-ppds &>/dev/null ||:
%changelog
* Fri Aug 20 2010 Tim Waugh <twaugh@redhat.com> - 3.10.6-3
- Added another SNMP quirk for an OfficeJet Pro 8500 variant.
* Thu Aug 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.6-2
- Use correct fax PPD name for Qt3 UI.
* Tue Jul 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-1
- 3.10.6.
- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351).