From 90c43b367273adacdcd330a96cc92760bf262f50 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jan 28 2009 18:04:31 +0000
Subject: - Always supply document-name when printing a file (STR #3055).


---

diff --git a/cups-str3055.patch b/cups-str3055.patch
new file mode 100644
index 0000000..8c87f05
--- /dev/null
+++ b/cups-str3055.patch
@@ -0,0 +1,25 @@
+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...
+   */
diff --git a/cups.spec b/cups.spec
index f6adc42..72ee8d9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -56,6 +56,7 @@ Patch29: cups-str2831.patch
 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 @@ module.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jan 28 2009 Tim Waugh <twaugh@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@redhat.com> 1:1.3.9-7