From 601043de1e637aa3c0a24ab29935ebc2ec0ffd78 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Oct 08 2009 11:51:07 +0000
Subject: - Fixed naming of 'Generic PostScript Printer' entry.


---

diff --git a/cups-generic-ps.patch b/cups-generic-ps.patch
new file mode 100644
index 0000000..eccf8a1
--- /dev/null
+++ b/cups-generic-ps.patch
@@ -0,0 +1,20 @@
+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 32b4f60..0739042 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -26,6 +26,7 @@ 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
@@ -181,6 +182,10 @@ 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
@@ -293,7 +298,7 @@ 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 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
+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.
@@ -505,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Oct  8 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-4
+- Fixed naming of 'Generic PostScript Printer' entry.
+
 * Wed Oct  7 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-3
 - Use upstream patch for STR #3356 (bug #526405).