- Removed stale patch from STR #2831 which was causing problems with

number-up (bug #532516).

cups-str2831.patch

@@ -1,13 +0,0 @@
-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);
-     }

cups.spec

@@ -18,6 +18,8 @@ Source2: cupsprinter.png
 Source3: cups-libusb.rules
 Source4: pstopdf
 Source5: cups-lpd
+Source6: pstoraster
+Source7: pstoraster.convs
 Source8: postscript.ppd.gz
 Source9: cups.logrotate
 Source10: ncp.backend
@@ -28,7 +30,6 @@ Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
-Patch4: cups-str2831.patch
 Patch5: cups-serial.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
@@ -194,7 +195,6 @@ gzip -n postscript.ppd
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
-%patch4 -p1 -b .str2831
 %patch5 -p1 -b .serial
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
@@ -307,6 +307,10 @@ install -c -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
 install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 %endif
 
+# Ship pstoraster (bug #69573).
+install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
+install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
+
 # Ship a generic postscript PPD file (#73061)
 install -c -m 644 postscript.ppd.gz $RPM_BUILD_ROOT%{_datadir}/cups/model
 
@@ -423,6 +427,7 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/lpoptions
 %dir %attr(0755,root,lp) /etc/cups/ppd
 %dir %attr(0700,root,lp) /etc/cups/ssl
+/etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %config(noreplace) %{_sysconfdir}/portreserve/%{name}
@@ -520,22 +525,22 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Oct 27 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.1-13
+* Tue Nov  3 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-13
+- Removed stale patch from STR #2831 which was causing problems with
+  number-up (bug #532516).
+
+* Tue Oct 27 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.1-12
 - Fix incorrectly applied patch from #STR3285 (bug #531108).
 - Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
 - Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
 - Fixed German translation (bug #531144, #STR3396).
 
-* Tue Oct 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.1-12
+* Tue Oct 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.1-11
 - Fix cups-lpd to create unique temporary data files (bug #529838).
 
-* Mon Oct 19 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-11
+* Mon Oct 19 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-10
 - Fixed German translation (bug #529575, STR #3380).
 
-* Thu Oct 15 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-10
-- Don't ship pstoraster -- it is now provided by the ghostscript-cups
-  package.
-
 * Thu Oct  8 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-9
 - Fixed naming of 'Generic PostScript Printer' entry.