From 3fcd028d7d18cd6906834e8e7cf6ca2c04f1040e Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 29 Jun 2006 11:53:08 +0000
Subject: [PATCH] - Require paps and use it for printing text (bug #197214).

---
 cups-paps.patch | 21 +++++++++++++++++++++
 cups.spec       | 10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 cups-paps.patch

diff --git a/cups-paps.patch b/cups-paps.patch
new file mode 100644
index 0000000..5487035
--- /dev/null
+++ b/cups-paps.patch
@@ -0,0 +1,21 @@
+--- 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
diff --git a/cups.spec b/cups.spec
index 496b728..d851a25 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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 @@ Patch13: cups-str1758.patch
 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 @@ BuildRequires: gcc >= 4.0.1
 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 @@ lpd emulation.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-15
+- Require paps and use it for printing text (bug #197214).
+
 * Thu Jun 15 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-14
 - Don't export in SSLLIBS to cups-config.