rpms/hplip/F-7 hplip-marker-supply.patch, 1.5, 1.6 hplip.spec, 1.138, 1.139

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8021

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


hplip-marker-supply.patch:

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:23:24 -0000	1.6
@@ -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/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- hplip.spec	11 Jul 2007 09:24:54 -0000	1.138
+++ hplip.spec	16 Jul 2007 17:23:24 -0000	1.139
@@ -19,6 +19,7 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
+Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
 Patch11: hplip-unload-traceback.patch
@@ -101,6 +102,9 @@
 # IPv6 support (bug #198377).
 %patch6 -p1 -b .ipv6
 
+# Low ink is a warning condition, not an error.
+%patch7 -p1 -b .marker-supply
+
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
@@ -288,6 +292,9 @@
 exit 0
 
 %changelog
+* Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
+- Low ink is a warning condition, not an error.
+
 * Wed Jul 11 2007 Tim Waugh <twaugh at redhat.com>
 - Show the HP Toolbox menu entry again.