rpms/ghostscript/devel ghostscript-runlibfileifexists.patch, 1.2, 1.3 cidfmap, 1.3, 1.4 ghostscript.spec, 1.153, 1.154

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6247

Modified Files:
	cidfmap ghostscript.spec 
Added Files:
	ghostscript-runlibfileifexists.patch 
Log Message:
* Fri Nov 30 2007 Tim Waugh <twaugh at redhat.com> 8.61-4
- Revert previous change, but define .runlibfileifexists, not just
  runlibfileifexists.


ghostscript-runlibfileifexists.patch:

Index: ghostscript-runlibfileifexists.patch
===================================================================
RCS file: ghostscript-runlibfileifexists.patch
diff -N ghostscript-runlibfileifexists.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ghostscript-runlibfileifexists.patch	30 Nov 2007 09:03:51 -0000	1.3
@@ -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.


Index: cidfmap
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/cidfmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cidfmap	28 Nov 2007 13:41:45 -0000	1.3
+++ cidfmap	30 Nov 2007 09:03:51 -0000	1.4
@@ -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


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ghostscript.spec	28 Nov 2007 13:47:27 -0000	1.153
+++ ghostscript.spec	30 Nov 2007 09:03:51 -0000	1.154
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -257,6 +257,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Nov 30 2007 Tim Waugh <twaugh at redhat.com> 8.61-4
+- Revert previous change, but define .runlibfileifexists, not just
+  runlibfileifexists.
+
 * Wed Nov 28 2007 Tim Waugh <twaugh at redhat.com> 8.61-3
 - No longer need runlibfileifexists.
 - Use runlibfile in cidfmap.