rpms/cups/FC-5 cups-str1740.patch,NONE,1.1 cups.spec,1.184,1.185

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1740.patch 
Log Message:
* Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4
- Applied upstream patch to fix STR #1740 (bug #192809).


cups-str1740.patch:
 pstops.c |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE cups-str1740.patch ---
--- cups-1.2.1/filter/pstops.c.str1740	2006-05-22 19:31:23.000000000 +0100
+++ cups-1.2.1/filter/pstops.c	2006-06-02 15:08:26.000000000 +0100
@@ -1305,6 +1305,9 @@
 
   if (first_page)
   {
+    char	*page_setup;		/* PageSetup commands to send */
+
+
     doc_puts(doc, "%%BeginPageSetup\n");
 
     if (pageinfo->num_options > 0)
@@ -1344,20 +1347,28 @@
       */
 
       if (doc_setup)
+      {
 	doc_puts(doc, doc_setup);
+	free(doc_setup);
+      }
 
       if (any_setup)
+      {
 	doc_puts(doc, any_setup);
+	free(any_setup);
+      }
+    }
 
-     /*
-      * Free the command strings...
-      */
+   /*
+    * Output commands for the current page...
+    */
 
-      if (doc_setup)
-	free(doc_setup);
+    page_setup = ppdEmitString(ppd, PPD_ORDER_PAGE, 0);
 
-      if (any_setup)
-	free(any_setup);
+    if (page_setup)
+    {
+      doc_puts(doc, page_setup);
+      free(page_setup);
     }
   }
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- cups.spec	1 Jun 2006 15:45:58 -0000	1.184
+++ cups.spec	2 Jun 2006 14:20:35 -0000	1.185
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.3
+Release: 1.4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -35,6 +35,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch14: cups-localhost.patch
+Patch15: cups-str1740.patch
 Patch16: cups-pie.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -132,6 +133,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch14 -p1 -b .localhost
+%patch15 -p1 -b .str1740
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -405,6 +407,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4
+- Applied upstream patch to fix STR #1740 (bug #192809).
+
 * Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed group ownerships again (bug #192880).