rpms/cups/devel cups-str1881.patch,1.1,1.2 cups.spec,1.242,1.243

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30906

Modified Files:
	cups-str1881.patch cups.spec 
Log Message:
* Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9
- Try different fix for STR #1795/STR #1881 (bug #201167).


cups-str1881.patch:
 job.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-str1881.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-str1881.patch	6 Aug 2006 11:04:17 -0000	1.1
+++ cups-str1881.patch	10 Aug 2006 17:10:47 -0000	1.2
@@ -1,6 +1,6 @@
---- cups-1.2.2/scheduler/job.c.str1881	2006-08-06 11:56:07.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
-@@ -3018,7 +3018,8 @@
+--- cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-10 17:34:27.000000000 +0100
+@@ -3018,11 +3018,17 @@
    envp[envc ++] = device_uri;
    envp[envc ++] = printer_name;
  
@@ -8,5 +8,17 @@
 +  if (!remote_job &&
 +      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
    {
-     snprintf(final_content_type, sizeof(final_content_type),
-              "FINAL_CONTENT_TYPE=%s/%s",
+-    snprintf(final_content_type, sizeof(final_content_type),
+-             "FINAL_CONTENT_TYPE=%s/%s",
+-	     filter->src->super, filter->src->type);
++    if (!strcmp (filter->dst->super, "printer"))
++      snprintf(final_content_type, sizeof(final_content_type),
++	       "FINAL_CONTENT_TYPE=application/octet-stream");
++    else
++      snprintf(final_content_type, sizeof(final_content_type),
++	       "FINAL_CONTENT_TYPE=%s/%s",
++	       filter->dst->super, filter->dst->type);
++
+     envp[envc ++] = final_content_type;
+   }
+ 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- cups.spec	6 Aug 2006 11:04:17 -0000	1.242
+++ cups.spec	10 Aug 2006 17:10:47 -0000	1.243
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -417,6 +417,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9
+- Try different fix for STR #1795/STR #1881 (bug #201167).
+
 * Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-8
 - Apply patch from STR #1881 for remote IPP printing (bug #201167).