rpms/cups/FC-5 cups-str2111.patch,NONE,1.1 cups.spec,1.232,1.233

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2111.patch 
Log Message:
* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.3
- Fixed extra EOF in pstops output (bug #216154, STR #2111).
- Resolves: rhbz#216154


cups-str2111.patch:
 pstops.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

--- NEW FILE cups-str2111.patch ---
--- cups-1.2.6/filter/pstops.c.str2111	2006-10-11 15:59:20.000000000 +0100
+++ cups-1.2.6/filter/pstops.c	2006-12-06 18:15:03.000000000 +0000
@@ -909,23 +909,26 @@
       * for the JCL options...
       */
 
-      if (!doc->saw_eof)
-	puts("%%EOF");
-
-      if (doc->emit_jcl)
+      if (number)
       {
-	if (ppd && ppd->jcl_end)
-	  ppdEmitJCLEnd(ppd, stdout);
-	else
-	  putchar(0x04);
+	if (!doc->saw_eof)
+	  puts("%%EOF");
 
-        ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
-      }
+	if (doc->emit_jcl)
+	{
+	  if (ppd && ppd->jcl_end)
+	    ppdEmitJCLEnd(ppd, stdout);
+	  else
+	    putchar(0x04);
+
+          ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
+	}
 
-      puts("%!PS-Adobe-3.0");
-      puts("%%Pages: (atend)");
-      puts("%%BoundingBox: (atend)");
-      puts("%%EndComments");
+	puts("%!PS-Adobe-3.0");
+	puts("%%Pages: (atend)");
+	puts("%%BoundingBox: (atend)");
+	puts("%%EndComments");
+      }
 
      /*
       * Then copy all of the pages...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- cups.spec	10 Nov 2006 17:26:52 -0000	1.232
+++ cups.spec	6 Dec 2006 18:16:45 -0000	1.233
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.6
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -23,6 +23,7 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-str2111.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -117,6 +118,7 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
+%patch4 -p1 -b .str2111
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -406,6 +408,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.3
+- Fixed extra EOF in pstops output (bug #216154, STR #2111).
+
 * Fri Nov 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.2
 - Reload, don't restart, when logrotating (bug #215023).