From 277864519c96bb986b6d1378e7260ac845a034be Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 9 Dec 2008 12:16:54 +0000
Subject: [PATCH] - Attempt to unbreak the fix for STR #2831 (bug #474742).

---
 cups-str2831.patch | 13 +++++++++++++
 cups.spec          |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 cups-str2831.patch

diff --git a/cups-str2831.patch b/cups-str2831.patch
new file mode 100644
index 0000000..8f79e04
--- /dev/null
+++ b/cups-str2831.patch
@@ -0,0 +1,13 @@
+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);
+     }
diff --git a/cups.spec b/cups.spec
index df3c028..1b2bedc 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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 @@ Source15: textonly.ppd
 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 @@ module.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Dec  9 2008 Tim Waugh <twaugh@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@redhat.com> 1:1.4-0.b1.4
 - Own more directories (bug #473581).