From 0c30445894477b20d896c8010b10e23077681341 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 28 Apr 2010 12:03:39 +0000
Subject: [PATCH] - Clear old printer-state-reasons we used to manage (bug
 #510926).

---
 hplip-clear-old-state-reasons.patch | 18 ++++++++++++++++++
 hplip.spec                          |  9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 hplip-clear-old-state-reasons.patch

diff --git a/hplip-clear-old-state-reasons.patch b/hplip-clear-old-state-reasons.patch
new file mode 100644
index 0000000..3d8852e
--- /dev/null
+++ b/hplip-clear-old-state-reasons.patch
@@ -0,0 +1,18 @@
+diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons	2010-04-28 12:23:08.296730566 +0100
++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp	2010-04-28 12:25:25.493730293 +0100
+@@ -479,6 +479,14 @@ int HPCupsFilter::StartPrintJob(int  arg
+ 
+     signal(SIGTERM, HPCancelJob);
+ 
++/*
++ *  Prior to the re-write of hpcups, this filter managed the
++ *  marker-supply-low-warning printer state reason.  Make sure to
++ *  clear that state reason so that upgrades work correctly.
++ */
++
++    fputs ("STATE: -marker-supply-low-warning\n", stderr);
++
+     cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ);
+ 
+     if (cups_raster == NULL) {
diff --git a/hplip.spec b/hplip.spec
index f4f1aa0..e74fd9d 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch8: hplip-retry-open.patch
 Patch9: hplip-tray-icon-crash.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
+Patch12: hplip-clear-old-state-reasons.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
 Patch17: hplip-deviceIDs-ppd.patch
@@ -160,6 +161,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
+# Clear old printer-state-reasons we used to manage (bug #510926).
+%patch12 -p1 -b .clear-old-state-reasons
+
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
@@ -410,6 +414,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Wed Apr 28 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-13
+- Clear old printer-state-reasons we used to manage (bug #510926).
+
 * Tue Apr 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-12
 - Added missing newline to string argument in dbglog() call (bug #585275).