From 2f99dfaf61582339084ee36431c3c43a40a2f177 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 9 Sep 2013 11:33:39 +0100
Subject: [PATCH] 9.10.

---
 .gitignore                         |  1 +
 ghostscript-pdf-charset-conv.patch | 17 -----------------
 ghostscript.spec                   | 13 ++++++-------
 sources                            |  2 +-
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 ghostscript-pdf-charset-conv.patch

diff --git a/.gitignore b/.gitignore
index faca97c..b99de81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ ghostscript-8.71.tar.xz
 /ghostscript-9.08.tar.bz2
 /ghostscript-9.09rc1.tar.gz
 /ghostscript-9.09.tar.bz2
+/ghostscript-9.10.tar.bz2
diff --git a/ghostscript-pdf-charset-conv.patch b/ghostscript-pdf-charset-conv.patch
deleted file mode 100644
index de9d0b9..0000000
--- a/ghostscript-pdf-charset-conv.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ghostscript-9.09/devices/vector/gdevpdfe.c.pdf-charset-conv ghostscript-9.09/devices/vector/gdevpdfe.c
---- ghostscript-9.09/devices/vector/gdevpdfe.c.pdf-charset-conv	2013-08-21 15:06:40.000000000 +0100
-+++ ghostscript-9.09/devices/vector/gdevpdfe.c	2013-08-22 16:33:24.665075217 +0100
-@@ -380,10 +380,10 @@ pdf_xmp_write_translated(gx_device_pdf *
-             }
-             memset(buf1, 0x00, (j * sizeof(UTF16)) + 2);
-             for (i = 0; i < j; i++) {
--                if (buf0[i] <= 0x7f || buf0[0] >= 0xAE) {
--                    if (buf0[0] == 0x7f) {
-+                if (buf0[i] <= 0x7f || buf0[i] >= 0xAE) {
-+                    if (buf0[i] == 0x7f) {
-                         emprintf1(pdev->memory, "PDFDocEncoding %x cannot be represented in Unicode\n",
--                            buf0[0]);
-+                            buf0[i]);
-                     } else
-                         buf1[(i * 2) + 3] = buf0[i];
-                 } else {
diff --git a/ghostscript.spec b/ghostscript.spec
index 5d06791..5d945c5 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,11 +1,11 @@
-%define gs_ver 9.09
-%define gs_dot_ver 9.09
+%define gs_ver 9.10
+%define gs_dot_ver 9.10
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -25,7 +25,6 @@ Patch6: ghostscript-Fontmap.local.patch
 Patch7: ghostscript-iccprofiles-initdir.patch
 Patch8: ghostscript-gdevcups-debug-uninit.patch
 Patch9: ghostscript-wrf-snprintf.patch
-Patch10: ghostscript-pdf-charset-conv.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 Requires: poppler-data
@@ -126,9 +125,6 @@ rm -rf expat freetype icclib jasper jpeg jpegxr lcms lcms2 libpng openjpeg zlib
 # Use more caution when converting floats to strings (bug #980085).
 %patch9 -p1 -b .wrf-snprintf
 
-# Fixed character set conversion issue in pdfwrite (bug #999927).
-%patch10 -p1 -b .pdf-charset-conv
-
 # Convert manual pages to UTF-8
 from8859_1() {
         iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -319,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Sep  9 2013 Tim Waugh <twaugh@redhat.com> 9.10-1
+- 9.10.
+
 * Wed Aug 28 2013 Tim Waugh <twaugh@redhat.com> 9.09-3
 - Remove jpegxr to ensure it isn't built (bug #1000387).
 
diff --git a/sources b/sources
index 0bdb189..56ac832 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-4f47c29daae8e567ebdef842b7e0f8ea  ghostscript-9.09.tar.bz2
+7179bb1ed4f6f453147e6f7e1f210ce8  ghostscript-9.10.tar.bz2