From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 12 Nov 2013 20:44:48 +0000 (+0100)
Subject: - reverted upstream change to FINAL_CONTENT_TYPE in order to fix printing
X-Git-Tag: auto/th/cups-1.7.0-1~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcups.git;a=commitdiff_plain;h=6df0c9a8643663f2ea86190e5f1d229d01fcd72d

- reverted upstream change to FINAL_CONTENT_TYPE in order to fix printing
  to remote CUPS servers (bug #1010580) (from fedora)
---

diff --git a/cups-final-content-type.patch b/cups-final-content-type.patch
new file mode 100644
index 0000000..7076e2b
--- /dev/null
+++ b/cups-final-content-type.patch
@@ -0,0 +1,17 @@
+diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c
+--- cups-1.6.4/scheduler/job.c.final-content-type	2013-09-27 16:58:13.934775402 +0100
++++ cups-1.6.4/scheduler/job.c	2013-09-27 17:00:57.716549576 +0100
+@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I
+ 
+     if (!job->printer->remote)
+     {
+-      for (filter = (mime_filter_t *)cupsArrayLast(filters);
+-           filter && filter->dst;
+-           filter = (mime_filter_t *)cupsArrayPrev(filters))
+-        if (strcmp(filter->dst->super, "printer") ||
+-            strcmp(filter->dst->type, job->printer->name))
+-          break;
++      filter = (mime_filter_t *)cupsArrayLast(filters);
+ 
+       if (filter && filter->dst)
+       {
diff --git a/cups.spec b/cups.spec
index 9398f95..7ad49df 100644
--- a/cups.spec
+++ b/cups.spec
@@ -45,6 +45,7 @@ Patch14:	add-ipp-backend-of-cups-1.4.patch
 Patch15:	reactivate_recommended_driver.patch
 Patch16:	read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
 Patch17:	%{name}-use-ipp1.1.patch
+Patch18:	%{name}-final-content-type.patch
 # avahi patches from fedora
 Patch100:	%{name}-avahi-address.patch
 Patch101:	%{name}-avahi-no-threaded.patch
@@ -267,6 +268,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %if %{with avahi}
 %patch100 -p1