From 2c3a600f79aa314a9a9fffdb9a618b55bf82db17 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 03 2009 16:52:32 +0000
Subject: - Removed stale patch from STR #2831 which was causing problems with

    number-up (bug #532516).

---

diff --git a/cups-str2831.patch b/cups-str2831.patch
deleted file mode 100644
index 3778fa6..0000000
--- a/cups-str2831.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-12-09 12:11:55.000000000 +0000
-+++ cups-1.3.9/filter/pstops.c	2008-12-09 12:12:19.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 9f54de8..71c1e27 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 6%{?svn:.svn%{svn}}%{?dist}
+Release: 7%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -50,7 +50,6 @@ Patch23: cups-str2101.patch
 Patch24: cups-str2536.patch
 Patch25: cups-localhost-ipv6.patch
 Patch26: cups-str3023.patch
-Patch29: cups-str2831.patch
 Patch30: cups-str3382.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -188,7 +187,6 @@ module.
 %patch24 -p1 -b .str2536
 %patch25 -p1 -b .localhost-ipv6
 %patch26 -p1 -b .str3023
-%patch29 -p1 -b .str2831
 %patch30 -p1 -b .str3382
 
 %if %lspp
@@ -510,6 +508,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Nov  3 2009 Tim Waugh <twaugh@redhat.com> 1:1.3.10-7
+- Removed stale patch from STR #2831 which was causing problems with
+  number-up (bug #532516).
+
 * Tue Oct 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.3.10-6
 - Fix cups-lpd to create unique temporary data files (bug #529838, STR #3382).