rpms/cups/F-12 cups-str3460.patch,NONE,1.1 cups.spec,1.569,1.570

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30447

Modified Files:
	cups.spec 
Added Files:
	cups-str3460.patch 
Log Message:
* Fri Jan 15 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-22
- Reset status after successful ipp job (bug #548219, STR #3460).


cups-str3460.patch:
 ipp.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE cups-str3460.patch ---
diff -up cups-1.4.2/backend/ipp.c.str3460 cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.str3460	2010-01-15 10:25:14.720258721 +0000
+++ cups-1.4.2/backend/ipp.c	2010-01-15 10:28:57.218384231 +0000
@@ -1435,7 +1435,10 @@ main(int  argc,				/* I - Number of comm
   else if (ipp_status > IPP_OK_CONFLICT)
     return (CUPS_BACKEND_FAILED);
   else
+  {
+    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
     return (CUPS_BACKEND_OK);
+  }
 }
 
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -p -r1.569 -r1.570
--- cups.spec	14 Jan 2010 12:37:44 -0000	1.569
+++ cups.spec	15 Jan 2010 10:40:36 -0000	1.570
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -75,6 +75,7 @@ Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
 Patch49: cups-gnutls-gcrypt-threads.patch
 Patch50: cups-str3458.patch
+Patch51: cups-str3460.patch
 
 Patch100: cups-lspp.patch
 
@@ -255,6 +256,7 @@ module. 
 %patch48 -p1 -b .str3431
 %patch49 -p1 -b .gnutls-gcrypt-threads
 %patch50 -p1 -b .str3458
+%patch51 -p1 -b .str3460
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -553,6 +555,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Jan 15 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-22
+- Reset status after successful ipp job (bug #548219, STR #3460).
+
 * Thu Jan 14 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
 - Install udev rules in correct place (bug #530378).