rpms/cups/F-11 cups.spec, 1.526, 1.527 sources, 1.51, 1.52 cups-generic-ps.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956

Modified Files:
	cups.spec sources 
Removed Files:
	cups-generic-ps.patch 
Log Message:
* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com>
- Removed postscript.ppd.gz (bug #533371).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -p -r1.526 -r1.527
--- cups.spec	3 Nov 2009 16:52:20 -0000	1.526
+++ cups.spec	10 Nov 2009 13:18:26 -0000	1.527
@@ -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
@@ -308,9 +302,6 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_
 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
@@ -521,6 +512,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com>
+- Removed postscript.ppd.gz (bug #533371).
+
 * Tue Nov  3 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
 - Removed stale patch from STR #2831 which was causing problems with
   number-up (bug #532516).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	30 Sep 2009 12:38:41 -0000	1.51
+++ sources	10 Nov 2009 13:18:26 -0000	1.52
@@ -1,2 +1 @@
-b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
 587a58039c112ecb3c932e048c8a7b01  cups-1.4.1-source.tar.bz2


--- cups-generic-ps.patch DELETED ---