From a0dbbb0e7156b84560675cd9a4d9ebf507ee20c6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 9 Jun 2010 15:50:36 +0000
Subject: [PATCH] - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug
 #581825).

---
 hplip-snmp-quirks.patch | 12 ++++++++++++
 hplip.spec              |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 hplip-snmp-quirks.patch

diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch
new file mode 100644
index 0000000..5b80afa
--- /dev/null
+++ b/hplip-snmp-quirks.patch
@@ -0,0 +1,12 @@
+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"
+       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;"
++      // This device lies about its supplies capacity.
++      Attribute "cupsSNMPQuirks" "" "capacity"
+       PCFileName "hp-officejet_pro_8500_a909g.ppd"
+       Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)"
+     }
diff --git a/hplip.spec b/hplip.spec
index 966994e..0f3e101 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -20,6 +20,7 @@ Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
 Patch5: hplip-device-ids.patch
 Patch6: hplip-mucks-with-spooldir.patch
+Patch7: hplip-snmp-quirks.patch
 Patch8: hplip-retry-open.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
@@ -143,6 +144,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # directly (bug #552572).
 %patch6 -p1 -b .mucks-with-spooldir
 
+# Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825).
+%patch7 -p1 -b .snmp-quirks
+
 # Retry when connecting to device fails (bug #532112).
 %patch8 -p1 -b .retry-open
 
@@ -404,6 +408,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Wed Jun  9 2010 Tim Waugh <twaugh@redhat.com> - 3.10.5-4
+- Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825).
+
 * Mon Jun 07 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.5-3
 - hplip-gui requires libsane-hpaio