rpms/cups/F-9 cups-str3055.patch, NONE, 1.1 cups-str3059.patch, NONE, 1.1 cups.spec, 1.434, 1.435
Tim Waugh
twaugh at fedoraproject.org
Wed Jan 28 18:02:39 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11795
Modified Files:
cups.spec
Added Files:
cups-str3055.patch cups-str3059.patch
Log Message:
* 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).
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:55:52.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...
*/
cups-str3059.patch:
--- NEW FILE cups-str3059.patch ---
diff -up cups-1.3.9/scheduler/type.c.str3059 cups-1.3.9/scheduler/type.c
--- cups-1.3.9/scheduler/type.c.str3059 2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/scheduler/type.c 2009-01-28 17:56:57.000000000 +0000
@@ -187,8 +187,7 @@ mimeAddTypeRule(mime_type_t *mt, /* I -
else if (*rule == '+' && current != NULL)
{
if (logic != MIME_MAGIC_AND &&
- current != NULL && current->prev != NULL &&
- current->prev->prev != NULL)
+ current != NULL && current->prev != NULL)
{
/*
* OK, we have more than 1 rule in the current tree level... Make a
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- cups.spec 28 Jan 2009 17:50:02 -0000 1.434
+++ cups.spec 28 Jan 2009 18:02:08 -0000 1.435
@@ -54,6 +54,8 @@
Patch28: cups-str2831.patch
Patch29: cups-str3077.patch
Patch30: cups-str3078.patch
+Patch31: cups-str3059.patch
+Patch32: cups-str3055.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -179,6 +181,8 @@
%patch28 -p1 -b .str2831
%patch29 -p1 -b .str3077
%patch30 -p1 -b .str3078
+%patch31 -p1 -b .str3059
+%patch32 -p1 -b .str3055
%if %lspp
%patch100 -p1 -b .lspp
@@ -459,6 +463,8 @@
%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).
- Fixed quotas (STR #3077, STR #3078).
- Removed all patch fuzz.
More information about the fedora-extras-commits
mailing list