From 166aa99c4e33888d9c2c90f64348794883ab770f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Dec 05 2008 11:33:24 +0000
Subject: - Attempt to unbreak the fix for STR #2831 (bug #474742).


---

diff --git a/cups-str2831.patch b/cups-str2831.patch
new file mode 100644
index 0000000..b57a07c
--- /dev/null
+++ b/cups-str2831.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.3.9/filter/pstops.c.str2831 cups-1.3.9/filter/pstops.c
+--- cups-1.3.9/filter/pstops.c.str2831	2008-09-24 00:44:43.000000000 +0100
++++ cups-1.3.9/filter/pstops.c	2008-12-05 11:31:49.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);
+     }
diff --git a/cups.spec b/cups.spec
index 6cc056e..0351280 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -48,6 +48,7 @@ Patch22: cups-strict-ppd-line-length.patch
 Patch25: cups-usb-paperout.patch
 Patch26: cups-CVE-2008-5183.patch
 Patch27: cups-CVE-2008-5286.patch
+Patch28: cups-str2831.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -163,6 +164,7 @@ lpd emulation.
 %patch25 -p1 -b .usb-paperout
 %patch26 -p1 -b .CVE-2008-5183
 %patch27 -p1 -b .CVE-2008-5286
+%patch28 -p1 -b .str2831
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -456,6 +458,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Dec  5 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.9-3
+- Attempt to unbreak the fix for STR #2831 (bug #474742).
+
 * Wed Dec  3 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.9-2
 - Applied patch to fix STR #2974 (bug #473905, CVE-2008-5286,
   CVE-2008-1722).