rpms/cups/FC-6 cups-str2111.patch,NONE,1.1 cups.spec,1.306,1.307
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 7 13:08:18 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31634
Modified Files:
cups.spec
Added Files:
cups-str2111.patch
Log Message:
* Thu Dec 7 2006 Tim Waugh <twaugh at redhat.com>
- 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-6/cups.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- cups.spec 28 Nov 2006 15:30:56 -0000 1.306
+++ cups.spec 7 Dec 2006 13:08:15 -0000 1.307
@@ -46,6 +46,7 @@
Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch
Patch22: cups-translate-prompt.patch
+Patch23: cups-str2111.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -150,6 +151,7 @@
%patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout
%patch22 -p1 -b .translate-prompt
+%patch23 -p1 -b .str2111
%if %lspp
%patch100 -p1 -b .lspp
@@ -432,6 +434,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Thu Dec 7 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed extra EOF in pstops output (bug #216154, STR #2111).
+
* Tue Nov 28 2006 Tim Waugh <twaugh at redhat.com>
- Ship an lpoptions file so it picks up the right SELinux file context.
More information about the fedora-cvs-commits
mailing list