rpms/cups/F-11 cups-str3308.patch,NONE,1.1 cups.spec,1.511,1.512

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3308.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed document-format-supported attribute when
  application/octet-stream is enabled (bug #516507, STR #3308, patch
  from Jiri Popelka).


cups-str3308.patch:
 printers.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3308.patch ---
diff -up cups-1.4rc1/scheduler/printers.c.str3308 cups-1.4rc1/scheduler/printers.c
--- cups-1.4rc1/scheduler/printers.c.str3308	2009-08-26 18:16:22.948769384 +0100
+++ cups-1.4rc1/scheduler/printers.c	2009-08-26 18:16:23.649770491 +0100
@@ -3718,10 +3718,6 @@ add_printer_formats(cupsd_printer_t *p)	
                       p->name, mimetype);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "add_printer_formats: %s: %d supported types",
-		  p->name, cupsArrayCount(p->filetypes) + 1);
-
  /*
   * Add the file formats that can be filtered...
   */
@@ -3732,9 +3728,13 @@ add_printer_formats(cupsd_printer_t *p)	
   else
     i = 0;
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "add_printer_formats: %s: %d supported types",
+                  p->name, cupsArrayCount(p->filetypes) + i);
+
   attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
                        "document-format-supported",
-		       cupsArrayCount(p->filetypes) + 1, NULL, NULL);
+                       cupsArrayCount(p->filetypes) + i, NULL, NULL);
 
   if (i)
     attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- cups.spec	26 Aug 2009 16:42:54 -0000	1.511
+++ cups.spec	26 Aug 2009 17:21:34 -0000	1.512
@@ -69,6 +69,7 @@ Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
+Patch45: cups-str3308.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -238,6 +239,7 @@ module. 
 %patch42 -p1 -b .str3287
 %patch43 -p1 -b .str3292
 %patch44 -p1 -b .str3293
+%patch45 -p1 -b .str3308
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed document-format-supported attribute when
+  application/octet-stream is enabled (bug #516507, STR #3308, patch
+  from Jiri Popelka).
 - Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).