rpms/cups/F-12 cups-str3436.patch,NONE,1.1 cups.spec,1.557,1.558

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3436.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The web interface did not show completed jobs (STR #3436).


cups-str3436.patch:
 ipp-var.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3436.patch ---
diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c
--- cups-1.4.2/cgi-bin/ipp-var.c.str3436	2009-11-09 23:01:17.000000000 +0000
+++ cups-1.4.2/cgi-bin/ipp-var.c	2009-12-08 12:19:01.988500453 +0000
@@ -333,7 +333,7 @@ cgiMoveJobs(http_t     *http,		/* I - Co
                    NULL, job_uri);
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                    "requested-attributes", NULL, "job-printer-uri");
-      
+
       if ((response = cupsDoRequest(http, request, "/")) != NULL)
       {
         if ((attr = ippFindAttribute(response, "job-printer-uri",
@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri,		/* I - C
 		 ishttps ? "https" : "http",
 		 userpass, hostname, port, resource);
       else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
+	snprintf(url, urlsize, "%s://%s:%d%s",
 		 ishttps ? "https" : "http",
 		 hostname, port, resource);
     }
@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t     *http,		/* I - Co
     */
 
     if (dest)
+    {
       snprintf(val, sizeof(val), "/%s/%s", section, dest);
+      cgiSetVariable("PRINTER_NAME", dest);
+      cgiSetVariable("PRINTER_URI_SUPPORTED", val);
+    }
     else
       strlcpy(val, "/jobs/", sizeof(val));
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -p -r1.557 -r1.558
--- cups.spec	8 Dec 2009 12:14:51 -0000	1.557
+++ cups.spec	8 Dec 2009 12:21:52 -0000	1.558
@@ -68,6 +68,7 @@ Patch41: cups-negative-snmp-string-lengt
 Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
+Patch45: cups-str3436.patch
 
 Patch100: cups-lspp.patch
 
@@ -241,6 +242,7 @@ module. 
 %patch42 -p1 -b .sidechannel-intrs
 %patch43 -p1 -b .media-empty-warning
 %patch44 -p1 -b .str3435
+%patch45 -p1 -b .str3436
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -540,6 +542,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing