rpms/cups/F-11 cups-str3460.patch,NONE,1.1 cups.spec,1.561,1.562

[Tim Waugh]

Author: twaugh

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

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-21
- 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-11/cups.spec,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -p -r1.561 -r1.562
--- cups.spec	23 Dec 2009 11:18:31 -0000	1.561
+++ cups.spec	15 Jan 2010 10:40:26 -0000	1.562
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -34,6 +34,7 @@ Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
 Patch9: cups-paps.patch
+Patch10: cups-str3460.patch
 Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
@@ -214,6 +215,7 @@ module. 
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
 %patch9 -p1 -b .paps
+%patch10 -p1 -b .str3460
 %patch11 -p1 -b .direct-usb
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
@@ -547,6 +549,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-21
+- Reset status after successful ipp job (bug #548219, STR #3460).
+
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
 - Fixed patch for STR #3425 again by adding in back-ported change from
   svn revision 8929 (bug #549899).  No longer need