rpms/ghostscript/F-8 ghostscript-runlibfileifexists.patch, NONE, 1.1 cidfmap, 1.3, 1.4 ghostscript.spec, 1.147, 1.148

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7040

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


ghostscript-runlibfileifexists.patch:

--- NEW FILE ghostscript-runlibfileifexists.patch ---
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/F-8/cidfmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cidfmap	29 Nov 2007 10:31:51 -0000	1.3
+++ cidfmap	30 Nov 2007 09:08:18 -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/F-8/ghostscript.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ghostscript.spec	29 Nov 2007 10:31:51 -0000	1.147
+++ ghostscript.spec	30 Nov 2007 09:08:18 -0000	1.148
@@ -19,6 +19,7 @@
 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
@@ -87,6 +88,9 @@
 # IJS KRGB patch.
 %patch5 -p1 -b .ijs-krgb
 
+# Define .runlibfileifexists.
+%patch6 -p1 -b .runlibfileifexists
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -257,6 +261,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Nov 30 2007 Tim Waugh <twaugh at redhat.com> 8.61-3
+- Revert previous change, but define .runlibfileifexists not just
+  runlibfileifexists.
+
 * Thu Nov 29 2007 Tim Waugh <twaugh at redhat.com> 8.61-2
 - Fixed cidfmap (bug #402481).