From e4ce15440b35b8f4d2f5ee31b1b09eeb28afd5ae Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 12 Aug 2010 13:20:28 +0100 Subject: [PATCH 1/3] Use correct fax PPD name for Qt3 UI. --- hplip-fax-ppd.patch | 20 ++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 hplip-fax-ppd.patch diff --git a/hplip-fax-ppd.patch b/hplip-fax-ppd.patch new file mode 100644 index 0000000..b0386d4 --- /dev/null +++ b/hplip-fax-ppd.patch @@ -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 = [] diff --git a/hplip.spec b/hplip.spec index 38c920e..1f3e2a5 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -22,6 +22,7 @@ Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-snmp-quirks.patch Patch8: hplip-retry-open.patch +Patch9: hplip-fax-ppd.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch @@ -150,6 +151,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open +# Use correct fax PPD name for Qt3 UI. +%patch9 -p1 -b .fax-ppd + # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method @@ -408,6 +412,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Aug 12 2010 Tim Waugh - 3.10.6-2 +- Use correct fax PPD name for Qt3 UI. + * Tue Jul 27 2010 Jiri Popelka - 3.10.6-1 - 3.10.6. From 473db4c176b7d7a1834b5b99edbed4193fe7f66a Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 20 Aug 2010 18:05:30 +0100 Subject: [PATCH 2/3] Added another SNMP quirk for an OfficeJet Pro 8500 variant. --- hplip-snmp-quirks.patch | 17 +++++++++++++---- hplip.spec | 5 ++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch index 5b80afa..4751465 100644 --- a/hplip-snmp-quirks.patch +++ b/hplip-snmp-quirks.patch @@ -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)" + } diff --git a/hplip.spec b/hplip.spec index 1f3e2a5..f9a838c 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -412,6 +412,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Fri Aug 20 2010 Tim Waugh +- Added another SNMP quirk for an OfficeJet Pro 8500 variant. + * Thu Aug 12 2010 Tim Waugh - 3.10.6-2 - Use correct fax PPD name for Qt3 UI. From d6ff8e4cafd6fabede5dd0c7129cec30e85780bf Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 25 Aug 2010 12:10:08 +0100 Subject: [PATCH 3/3] Bumped release in changelog. --- hplip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index f9a838c..f821397 100644 --- a/hplip.spec +++ b/hplip.spec @@ -412,7 +412,7 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog -* Fri Aug 20 2010 Tim Waugh +* Fri Aug 20 2010 Tim Waugh - 3.10.6-3 - Added another SNMP quirk for an OfficeJet Pro 8500 variant. * Thu Aug 12 2010 Tim Waugh - 3.10.6-2