From d7d2317b15dceb7ec0504a6c16ce734fda6168ed Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 25 Apr 2006 16:20:39 +0000
Subject: [PATCH] - 8.15.2. - No longer need build, krgb, pdfwrite, str1570
 patches.

---
 .cvsignore                      |  1 +
 ghostscript-big-cmap-post.patch | 15 +++++++--------
 ghostscript.spec                | 23 +++++++----------------
 sources                         |  2 +-
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 239a002..7a774d5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,3 +15,4 @@ adobe-cmaps-200204.tar.gz
 espgs-8.15rc4-source.tar.bz2
 espgs-8.15.1-source.tar.bz2
 adobe-cmaps-200406.tar.gz
+espgs-8.15.2-source.tar.bz2
diff --git a/ghostscript-big-cmap-post.patch b/ghostscript-big-cmap-post.patch
index a8b6dc3..c6b6db6 100644
--- a/ghostscript-big-cmap-post.patch
+++ b/ghostscript-big-cmap-post.patch
@@ -1,6 +1,5 @@
-diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps
---- espgs-8.15.1.orig/lib/gs_ttf.ps	2005-08-12 04:57:14.000000000 +0900
-+++ espgs-8.15.1/lib/gs_ttf.ps	2006-01-26 13:28:18.000000000 +0900
+--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
++++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
 @@ -261,6 +261,54 @@
    } for pop exch pop
  } bind def
@@ -146,10 +145,10 @@ diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps
    (OS/2) 1 index
 -  (post) 1 index
 +  (post) { .readbigtable }
-   (vhea) 1 index
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -860,10 +908,17 @@
+   %(vhea) 1 index
+   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
+   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
+@@ -867,10 +915,17 @@
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
@@ -171,7 +170,7 @@ diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -922,22 +977,22 @@
+@@ -929,22 +984,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary
diff --git a/ghostscript.spec b/ghostscript.spec
index 396d7dc..6c7d91b 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,11 +1,11 @@
-%define gs_ver 8.15.1
+%define gs_ver 8.15.2
 %define gs_dot_ver 8.15
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 10
+Release: 2
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -16,7 +16,6 @@ Source2: adobe-cmaps-200406.tar.gz
 Source3: acro5-cmaps-2001.tar.gz
 Source4: cidfmap
 
-Patch1: ghostscript-build.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
 Patch4: ghostscript-ps2epsi.patch
@@ -26,9 +25,6 @@ Patch7: ghostscript-noopt.patch
 Patch8: ghostscript-use-external-freetype.patch
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
-Patch11: ghostscript-krgb.patch
-Patch12: espgs-pdfwrite.patch
-Patch13: espgs-str1570.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -83,7 +79,6 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
 
 # Make it build.
-%patch1 -p1 -b .build
 %patch2 -p1 -b .gtk2
 
 # Fix some shell scripts
@@ -109,15 +104,6 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 # Support reading a big cmap/post table from a TrueType font.
 %patch10 -p1 -b .big-cmap-post
 
-# Updated KRGB patch for gdevijs.
-%patch11 -p1 -b .krgb
-
-# Fix pdfwrite (bug #187834).
-%patch12 -p1 -b .pdfwrite
-
-# Fix emacs interaction (bug #189321, STR #1570).
-%patch13 -p0 -b .str1570
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -275,8 +261,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
+%{_libdir}/pkgconfig/ijs.pc
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-2
+- 8.15.2.
+- No longer need build, krgb, pdfwrite, str1570 patches.
+
 * Mon Apr 24 2006 Tim Waugh <twaugh@redhat.com> 8.15.1-10
 - Fix emacs interaction (bug #189321, STR #1570).
 
diff --git a/sources b/sources
index e2be2c6..77de599 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
-2a21136953c3559e6088522753b06b1f  espgs-8.15.1-source.tar.bz2
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
+66180d4c0aa44c4c51ea58e13b08f2ae  espgs-8.15.2-source.tar.bz2