rpms/hplip/F-11 hplip-clear-old-state-reasons.patch, NONE, 1.1 hplip.spec, 1.250, 1.251

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26169

Modified Files:
	hplip.spec 
Added Files:
	hplip-clear-old-state-reasons.patch 
Log Message:
* Wed Apr 28 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-6
- Clear old printer-state-reasons we used to manage (bug #510926).


hplip-clear-old-state-reasons.patch:
 HPCupsFilter.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE hplip-clear-old-state-reasons.patch ---
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) {


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- hplip.spec	27 Apr 2010 11:03:34 -0000	1.250
+++ hplip.spec	28 Apr 2010 11:51:05 -0000	1.251
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch7: hplip-tray-icon-crash.patch
 Patch8: hplip-retry-open.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-skip-blank-lines.patch
@@ -151,6 +152,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
 
@@ -397,6 +401,9 @@ exit 0
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Wed Apr 28 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-6
+- Clear old printer-state-reasons we used to manage (bug #510926).
+
 * Tue Apr 27 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-5
 - Added missing newline to string argument in dbglog() call (bug #585275).