diff --git a/cups-paps.patch b/cups-paps.patch index 5487035..f320687 100644 --- a/cups-paps.patch +++ b/cups-paps.patch @@ -1,19 +1,11 @@ ---- cups-1.2.1/conf/mime.convs.paps 2006-06-29 12:51:14.000000000 +0100 -+++ cups-1.2.1/conf/mime.convs 2006-06-29 12:51:54.000000000 +0100 -@@ -46,12 +46,12 @@ - application/pdf application/postscript 33 pdftops - application/postscript application/vnd.cups-postscript 66 pstops - application/vnd.hp-HPGL application/postscript 66 hpgltops --application/x-cshell application/postscript 33 texttops --application/x-csource application/postscript 33 texttops --application/x-perl application/postscript 33 texttops --application/x-shell application/postscript 33 texttops +--- cups-1.2.1/conf/mime.convs.paps 2006-04-14 20:21:03.000000000 +0100 ++++ cups-1.2.1/conf/mime.convs 2006-06-29 15:12:57.000000000 +0100 +@@ -50,8 +50,8 @@ + application/x-csource application/postscript 33 texttops + application/x-perl application/postscript 33 texttops + application/x-shell application/postscript 33 texttops -text/plain application/postscript 33 texttops -text/html application/postscript 33 texttops -+application/x-cshell application/postscript 33 texttopaps -+application/x-csource application/postscript 33 texttopaps -+application/x-perl application/postscript 33 texttopaps -+application/x-shell application/postscript 33 texttopaps +text/plain application/postscript 33 texttopaps +text/html application/postscript 33 texttopaps image/gif application/vnd.cups-postscript 66 imagetops diff --git a/cups.spec b/cups.spec index d851a25..4343b48 100644 --- a/cups.spec +++ b/cups.spec @@ -76,7 +76,7 @@ BuildPrereq: dbus-devel >= 0.60 Requires: dbus >= 0.60 # The paps package uses pango to render UTF-8 text to PostScript. -Requires: paps >= 0.6.6-8.fc6 +Requires: paps >= 0.6.6-9 %package devel Summary: Common Unix Printing System - development environment @@ -401,6 +401,10 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Thu Jun 29 2006 Tim Waugh +- Bumped paps requirement. +- Don't use texttopaps for application/* MIME types (bug #197214). + * Thu Jun 29 2006 Tim Waugh 1:1.2.1-15 - Require paps and use it for printing text (bug #197214).