diff --git a/cups.spec b/cups.spec index 8b3bc65..7bd29c4 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2 @@ -18,8 +18,6 @@ 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 @@ -296,10 +294,6 @@ 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 @@ -416,7 +410,6 @@ 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} @@ -514,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Thu Oct 15 2009 Tim Waugh 1:1.4.1-10 +- Don't ship pstoraster -- it is now provided by the ghostscript-cups + package. + * Thu Oct 8 2009 Tim Waugh 1:1.4.1-9 - Fixed naming of 'Generic PostScript Printer' entry. diff --git a/pstoraster b/pstoraster deleted file mode 100644 index 313baa6..0000000 --- a/pstoraster +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -# "$Id: pstoraster.in,v 1.3 2002/05/12 00:46:34 easysw Exp $" -# -# CUPS filter script for Ghostscript. -# -# Copyright 2001-2002 by Easy Software Products. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# - -# Installation directories... -prefix=/usr -exec_prefix=${prefix} -bindir=${exec_prefix}/bin - -# Set the library/font path... -GS_FONTPATH="$CUPS_FONTPATH" -export GS_FONTPATH - -# Options we use with Ghostscript... -gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH " -gsopts="$gsopts -dNOMEDIAATTRS -sDEVICE=cups -sstdout=%stderr" - -# See if we have a profile=n,n,n,n,n,n,n,n,n,n,n option... -profile="" -for option in $5; do - case $option in - profile=*) - profile="-scupsProfile=`echo $option | awk -F= '{print $2}'`" - ;; - esac -done - -# See if we have a filename on the command-line... -if test -z "$6"; then - ifile="-_" -else - ifile="$6" -fi - -# Now run Ghostscript... -exec $bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile - -# -# End of "$Id: pstoraster.in,v 1.3 2002/05/12 00:46:34 easysw Exp $". -# diff --git a/pstoraster.convs b/pstoraster.convs deleted file mode 100644 index e498d59..0000000 --- a/pstoraster.convs +++ /dev/null @@ -1,29 +0,0 @@ -# -# "$Id: pstoraster.convs,v 1.1 2002/04/23 11:58:37 easysw Exp $" -# -# MIME converts file for Ghostscript. -# -# Copyright 1997-2002 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Easy Software Products and are protected by Federal -# copyright law. Distribution and use rights are outlined in the file -# "LICENSE.txt" which should have been included with this file. If this -# file is missing or damaged please contact Easy Software Products -# at: -# -# Attn: CUPS Licensing Information -# Easy Software Products -# 44141 Airport View Drive, Suite 204 -# Hollywood, Maryland 20636-3111 USA -# -# Voice: (301) 373-9603 -# EMail: cups-info@cups.org -# WWW: http://www.cups.org -# - -application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster - -# -# End of "$Id: pstoraster.convs,v 1.1 2002/04/23 11:58:37 easysw Exp $". -#