From acc1ed897621255e3ed5576ab314960db71a2bc4 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 17 Jun 2010 14:46:47 +0000
Subject: [PATCH] - Fixed marker-supply attributes in hpijs (bug #605269).

---
 hplip-bad-state-attr.patch | 17 +++++++++++++++++
 hplip.spec                 |  9 ++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 hplip-bad-state-attr.patch

diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch
new file mode 100644
index 0000000..9c74f35
--- /dev/null
+++ b/hplip-bad-state-attr.patch
@@ -0,0 +1,17 @@
+diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp
+--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr	2010-06-17 15:11:53.417989598 +0100
++++ hplip-3.10.5/prnt/hpijs/hpijs.cpp	2010-06-17 15:28:41.169989632 +0100
+@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char *
+ 			case WARN_LOW_INK_YELLOW:
+ 			case WARN_LOW_INK_MULTIPLE_PENS:
+                         {
+-			   BUG ("STATE: +marker-supply-low-warning\n");
++			   fputs("STATE: +marker-supply-low-warning\n", stderr);
+                            break;
+                         }
+ 			default:
+-			   BUG ("STATE: -marker-supply-low-warning\n");
++			   fputs("STATE: -marker-supply-low-warning\n", stderr);
+ 		}
+     }
+ 
diff --git a/hplip.spec b/hplip.spec
index 8999f09..cf57850 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: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -26,6 +26,7 @@ Patch9: hplip-snmp-quirks.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-clear-old-state-reasons.patch
+Patch13: hplip-bad-state-attr.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
 Patch17: hplip-deviceIDs-ppd.patch
@@ -169,6 +170,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Clear old printer-state-reasons we used to manage (bug #510926).
 %patch12 -p1 -b .clear-old-state-reasons
 
+# Fixed marker-supply attributes in hpijs (bug #605269).
+%patch13 -p1 -b .bad-state-attr
+
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
@@ -439,6 +443,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Thu Jun 17 2010 Tim Waugh <twaugh@redhat.com> - 3.10.5-5
+- Fixed marker-supply attributes in hpijs (bug #605269).
+
 * 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).