rpms/hplip/devel hplip-marker-supply.patch, 1.5, 1.6 hplip.spec, 1.145, 1.146

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6858

Modified Files:
	hplip.spec 
Added Files:
	hplip-marker-supply.patch 
Log Message:
* Mon Jul 16  2007 Tim Waugh <twaugh at redhat.com> 2.7.6-7
- 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:21:04 -0000	1.6
@@ -0,0 +1,16 @@
+--- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply	2007-07-16 18:19:31.000000000 +0100
++++ hplip-2.7.6/prnt/hpijs/hpijs.cpp	2007-07-16 18:19:43.000000000 +0100
+@@ -534,11 +534,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/devel/hplip.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- hplip.spec	11 Jul 2007 16:13:00 -0000	1.145
+++ hplip.spec	16 Jul 2007 17:21:04 -0000	1.146
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -17,6 +17,7 @@
 Patch1: hplip-desktop.patch
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
+Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
@@ -95,6 +96,9 @@
 # Quieten hpssd on startup.
 %patch3 -p1 -b .quiet
 
+# Low ink is a warning condition, not an error.
+%patch4 -p1 -b .marker-supply
+
 # libhpip should link against libm (bug #197599).
 %patch5 -p1 -b .libm
 
@@ -265,6 +269,9 @@
 exit 0
 
 %changelog
+* Mon Jul 16  2007 Tim Waugh <twaugh at redhat.com> 2.7.6-7
+- Low ink is a warning condition, not an error.
+
 * Wed Jul 11 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-6
 - Add hp-check back, but in the gui sub-package.
 - Show the HP Toolbox menu entry again.