rpms/cups/F-10 cups-str3055.patch,NONE,1.1 cups.spec,1.453,1.454

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3055.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Always supply document-name when printing a file (STR #3055).


cups-str3055.patch:

--- NEW FILE cups-str3055.patch ---
diff -up cups-1.3.9/cups/util.c.str3055 cups-1.3.9/cups/util.c
--- cups-1.3.9/cups/util.c.str3055	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/cups/util.c	2009-01-28 17:59:03.000000000 +0000
@@ -1253,6 +1253,21 @@ cupsPrintFiles2(http_t        *http,	/* 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
                  title);
 
+  if (num_files == 1)
+  {
+   /*
+    * Add the original document filename...
+    */
+
+    if ((base = strrchr(files[0], '/')) != NULL)
+      base ++;
+    else
+      base = files[0];
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
+		 NULL, base);
+  }
+
  /*
   * Then add all options...
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- cups.spec	28 Jan 2009 17:49:12 -0000	1.453
+++ cups.spec	28 Jan 2009 18:04:31 -0000	1.454
@@ -56,6 +56,7 @@
 Patch30: cups-str3077.patch
 Patch31: cups-str3078.patch
 Patch32: cups-str3059.patch
+Patch33: cups-str3055.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -198,6 +199,7 @@
 %patch30 -p1 -b .str3077
 %patch31 -p1 -b .str3078
 %patch32 -p1 -b .str3059
+%patch33 -p1 -b .str3055
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -487,6 +489,7 @@
 
 %changelog
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Always supply document-name when printing a file (STR #3055).
 - Load MIME type rules correctly (bug #426089, STR #3059).
 
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7