rpms/hplip/FC-6 hplip-marker-supply.patch, 1.2, 1.3 hplip.spec, 1.111, 1.112

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20892

Modified Files:
	hplip.spec 
Added Files:
	hplip-marker-supply.patch 
Log Message:
* Mon Jul 16 2007 Tim Waugh <twaugh at redhat.com>
- Low ink is a warning condition, not an error.


hplip-marker-supply.patch:
 hpijs.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-marker-supply.patch
===================================================================
RCS file: hplip-marker-supply.patch
diff -N hplip-marker-supply.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-marker-supply.patch	16 Jul 2007 17:24:52 -0000	1.3
@@ -0,0 +1,16 @@
+--- hplip-1.7.4a/prnt/hpijs/hpijs.cpp.marker-supply	2007-07-16 18:21:07.000000000 +0100
++++ hplip-1.7.4a/prnt/hpijs/hpijs.cpp	2007-07-16 18:21:39.000000000 +0100
+@@ -536,11 +536,11 @@
+ 			case WARN_LOW_INK_YELLOW:
+ 			case WARN_LOW_INK_MULTIPLE_PENS:
+             {
+-				bug ("STATE: marker-supply-low\n");
++				bug ("STATE: marker-supply-low-warning\n");
+                 break;
+             }
+ 			default:
+-				bug ("STATE: -marker-supply-low");
++				bug ("STATE: -marker-supply-low-warning");
+ 		}
+     }
+ 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- hplip.spec	10 Jul 2007 11:37:20 -0000	1.111
+++ hplip.spec	16 Jul 2007 17:24:52 -0000	1.112
@@ -22,6 +22,7 @@
 Patch7: hplip-media-empty.patch
 Patch8: hplip-unload-traceback.patch
 Patch9: hplip-no-root-config.patch
+Patch10: hplip-marker-supply.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -101,6 +102,9 @@
 # Prevent SELinux audit message from the CUPS backends (bug #241776)
 %patch9 -p1 -b .no-root-config
 
+# Low ink is a warning condition, not an error.
+%patch10 -p1 -b .marker-supply
+
 autoconf # for patch4
 
 %build
@@ -203,6 +207,9 @@
 exit 0
 
 %changelog
+* Mon Jul 16 2007 Tim Waugh <twaugh at redhat.com>
+- Low ink is a warning condition, not an error.
+
 * Tue Jul 10 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
 - 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies
   patches.