From 3e4c6fe3b7fbb1d4bd397af2366efc29ad5a1265 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 30 Nov 2007 09:03:51 +0000
Subject: [PATCH] - Revert previous change, but define .runlibfileifexists, not
 just     runlibfileifexists.

---
 cidfmap                              | 10 +++++-----
 ghostscript-runlibfileifexists.patch | 26 ++++++++++++++++++++++++++
 ghostscript.spec                     |  6 +++++-
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 ghostscript-runlibfileifexists.patch

diff --git a/cidfmap b/cidfmap
index ec04d5c..18c1786 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) .runlibfile
-(cidfmap.ko) .runlibfile
-(cidfmap.zh_CN) .runlibfile
-(cidfmap.zh_TW) .runlibfile
+(cidfmap.ja) .runlibfileifexists
+(cidfmap.ko) .runlibfileifexists
+(cidfmap.zh_CN) .runlibfileifexists
+(cidfmap.zh_TW) .runlibfileifexists
 % must be at the bottom of line to allow people overriding everything.
-(cidfmap.local) .runlibfile
+(cidfmap.local) .runlibfileifexists
diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch
new file mode 100644
index 0000000..ea900df
--- /dev/null
+++ b/ghostscript-runlibfileifexists.patch
@@ -0,0 +1,26 @@
+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-10-31 17:00:55.000000000 +0000
++++ ghostscript-8.61/lib/gs_init.ps	2007-11-30 09:02:19.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		% <object> <errorname> signalerror -
+@@ -839,6 +847,7 @@ userdict /.currentresourcefile //null pu
+ 	} bind def
+ % Temporarily substitute it for the real runlibfile.
+ /.runlibfile /runlibfile load def
++/.runlibfileifexists /runlibfile load def
+ /runlibfile /runlibfile0 load def
+ 
+ % Create the error handling machinery.
diff --git a/ghostscript.spec b/ghostscript.spec
index 605605e..bbc2207 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Nov 30 2007 Tim Waugh <twaugh@redhat.com> 8.61-4
+- Revert previous change, but define .runlibfileifexists, not just
+  runlibfileifexists.
+
 * Wed Nov 28 2007 Tim Waugh <twaugh@redhat.com> 8.61-3
 - No longer need runlibfileifexists.
 - Use runlibfile in cidfmap.