rpms/cups/devel cups-paps.patch,NONE,1.1 cups.spec,1.220,1.221

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv817

Modified Files:
	cups.spec 
Added Files:
	cups-paps.patch 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-15
- Require paps and use it for printing text (bug #197214).


cups-paps.patch:
 mime.convs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE cups-paps.patch ---
--- 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
-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
 image/png		application/vnd.cups-postscript	66	imagetops
 image/jpeg		application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- cups.spec	15 Jun 2006 12:16:06 -0000	1.220
+++ cups.spec	29 Jun 2006 11:53:08 -0000	1.221
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -36,6 +36,7 @@
 Patch14: cups-str1736.patch
 Patch15: cups-str1776.patch
 Patch16: cups-no-export-ssllibs.patch
+Patch17: cups-paps.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -74,6 +75,9 @@
 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
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -131,6 +135,7 @@
 %patch14 -p1 -b .str1736
 %patch15 -p1 -b .str1776
 %patch16 -p1 -b .no-export-ssllibs
+%patch17 -p1 -b .paps
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -396,6 +401,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-15
+- Require paps and use it for printing text (bug #197214).
+
 * Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-14
 - Don't export in SSLLIBS to cups-config.