From 85cfb8e7e196b4937ff9e673a4fabba76ee02867 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 10 Nov 2009 12:50:59 +0000
Subject: [PATCH] - Removed postscript.ppd.gz (bug #533371).

---
 cups-generic-ps.patch | 20 --------------------
 cups.spec             | 12 +++---------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 cups-generic-ps.patch

diff --git a/cups-generic-ps.patch b/cups-generic-ps.patch
deleted file mode 100644
index eccf8a1..0000000
--- a/cups-generic-ps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up ./postscript.ppd.generic-ps ./postscript.ppd
---- ./postscript.ppd.generic-ps	2009-10-08 11:08:07.389336611 +0100
-+++ ./postscript.ppd	2009-10-08 11:06:40.836338000 +0100
-@@ -12,11 +12,11 @@
- *LanguageVersion: English
- *LanguageEncoding: ISOLatin1
- *PCFileName:	"POSTSCRIPT.PPD"
--*Manufacturer:	"Postscript"
--*Product:	"(CUPS v1.1)"
--*ModelName:     "Generic postscript printer"
--*ShortNickName: "Generic postscript printer"
--*NickName:      "Generic postscript printer"
-+*Manufacturer:	"Generic"
-+*Product:	"(PostScript Printer)"
-+*ModelName:     "Generic PostScript Printer"
-+*ShortNickName: "Generic PostScript Printer"
-+*NickName:      "Generic PostScript Printer"
- *PSVersion:	"(2017.000) 0"
- *LanguageLevel:	"2"
- *ColorDevice:	False
diff --git a/cups.spec b/cups.spec
index 583c021..179a696 100644
--- a/cups.spec
+++ b/cups.spec
@@ -20,13 +20,11 @@ Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
 Source7: pstoraster.convs
-Source8: postscript.ppd.gz
 Source9: cups.logrotate
 Source10: ncp.backend
 Source12: cups.cron
 Source14: textonly.filter
 Source15: textonly.ppd
-Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
@@ -188,10 +186,6 @@ module.
 
 %prep
 %setup -q
-gunzip -c %{SOURCE8} > postscript.ppd
-%patch0 -p0 -b .generic-ps
-gzip -n postscript.ppd
-
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -311,9 +305,6 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 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
-
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
@@ -525,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Nov 10 2009 Tim Waugh <twaugh@redhat.com>
+- Removed postscript.ppd.gz (bug #533371).
+
 * 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).