rpms/cups/devel cups-str2831.patch,NONE,1.1 cups.spec,1.449,1.450

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12383

Modified Files:
	cups.spec 
Added Files:
	cups-str2831.patch 
Log Message:
* Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b1.5
- Attempt to unbreak the fix for STR #2831 (bug #474742).


cups-str2831.patch:

--- NEW FILE cups-str2831.patch ---
diff -up cups-1.4b1/filter/pstops.c.str2831 cups-1.4b1/filter/pstops.c
--- cups-1.4b1/filter/pstops.c.str2831	2008-12-09 12:14:53.000000000 +0000
+++ cups-1.4b1/filter/pstops.c	2008-12-09 12:14:57.000000000 +0000
@@ -1547,9 +1547,6 @@ copy_page(cups_file_t  *fp,		/* I - File
       else if (!strncmp(line, "%%Include", 9))
 	continue;
 
-      if (line[0] != '%' && !feature)
-        break;
-
       if (!feature || (doc->number_up == 1 && !doc->fitplot))
 	doc_write(doc, line, linelen);
     }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- cups.spec	30 Nov 2008 22:45:28 -0000	1.449
+++ cups.spec	9 Dec 2008 12:16:54 -0000	1.450
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.4%{?dist}
+Release: 0.%{pre}.5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@@ -27,6 +27,7 @@
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
+Patch4: cups-str2831.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -166,6 +167,7 @@
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .str2831
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -446,6 +448,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b1.5
+- Attempt to unbreak the fix for STR #2831 (bug #474742).
+
 * Sun Nov 30 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b1.4
 - Own more directories (bug #473581).