From 58606b2428b62f0a4d2bd2ee96d57008344d793c Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 28 Nov 2007 13:41:45 +0000 Subject: [PATCH] - No longer need runlibfileifexists. - Use runlibfile in cidfmap. --- cidfmap | 10 +++++----- ghostscript-runlibfileifexists.patch | 18 ------------------ ghostscript.spec | 10 +++++----- 3 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 ghostscript-runlibfileifexists.patch diff --git a/cidfmap b/cidfmap index 18c1786..ec04d5c 100644 --- a/cidfmap +++ b/cidfmap @@ -2,9 +2,9 @@ % Don't change following line. We should ensure that the original one is surely loaded. (cidfmap.GS) .runlibfile % following lines are for CJK fonts. -(cidfmap.ja) .runlibfileifexists -(cidfmap.ko) .runlibfileifexists -(cidfmap.zh_CN) .runlibfileifexists -(cidfmap.zh_TW) .runlibfileifexists +(cidfmap.ja) .runlibfile +(cidfmap.ko) .runlibfile +(cidfmap.zh_CN) .runlibfile +(cidfmap.zh_TW) .runlibfile % must be at the bottom of line to allow people overriding everything. -(cidfmap.local) .runlibfileifexists +(cidfmap.local) .runlibfile diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch deleted file mode 100644 index 0a7624a..0000000 --- a/ghostscript-runlibfileifexists.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib/gs_init.ps ---- ghostscript-8.61/lib/gs_init.ps.runlibfileifexists 2007-11-28 11:24:58.000000000 +0000 -+++ ghostscript-8.61/lib/gs_init.ps 2007-11-28 12:03:08.000000000 +0000 -@@ -671,6 +671,14 @@ systemdict /internaldict dup .makeintern - { /undefinedfilename signalerror } - ifelse - } bind def -+/runlibfileifexists -+ { % We don't want to bind 'run' into this procedure, -+ % since run may get redefined. -+ findlibfile -+ { exch pop /run .systemvar exec } -+ { pop } -+ ifelse -+ } bind def - /selectdevice - { finddevice setdevice .setdefaultscreen } bind def - /signalerror % signalerror - diff --git a/ghostscript.spec b/ghostscript.spec index 133d3f3..9ae0315 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ @@ -19,7 +19,6 @@ Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch Patch4: ghostscript-fPIC.patch Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch -Patch6: ghostscript-runlibfileifexists.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -88,9 +87,6 @@ A GTK-enabled version of Ghostscript, called 'gsx'. # IJS KRGB patch. %patch5 -p1 -b .ijs-krgb -# Add runlibfileifexists to gs_init.ps. -%patch6 -p1 -b .runlibfileifexists - # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -261,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Wed Nov 28 2007 Tim Waugh 8.61-3 +- No longer need runlibfileifexists. +- Use runlibfile in cidfmap. + * Wed Nov 28 2007 Tim Waugh 8.61-2 - Add /usr/share/fonts to fontpath (bug #402551). - Restore cidfmap-switching bits, except for FAPIcidfmap which is no