rpms/ghostscript/devel cidfmap, 1.2, 1.3 ghostscript.spec, 1.151, 1.152 ghostscript-runlibfileifexists.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cidfmap ghostscript.spec 
Removed Files:
	ghostscript-runlibfileifexists.patch 
Log Message:
* Wed Nov 28 2007 Tim Waugh <twaugh at redhat.com> 8.61-3
- No longer need runlibfileifexists.
- Use runlibfile in cidfmap.



Index: cidfmap
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/cidfmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cidfmap	17 Apr 2007 10:05:22 -0000	1.2
+++ cidfmap	28 Nov 2007 13:41:45 -0000	1.3
@@ -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


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ghostscript.spec	28 Nov 2007 12:50:53 -0000	1.151
+++ ghostscript.spec	28 Nov 2007 13:41:45 -0000	1.152
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -19,7 +19,6 @@
 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 @@
 # 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 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Nov 28 2007 Tim Waugh <twaugh at redhat.com> 8.61-3
+- No longer need runlibfileifexists.
+- Use runlibfile in cidfmap.
+
 * Wed Nov 28 2007 Tim Waugh <twaugh at redhat.com> 8.61-2
 - Add /usr/share/fonts to fontpath (bug #402551).
 - Restore cidfmap-switching bits, except for FAPIcidfmap which is no


--- ghostscript-runlibfileifexists.patch DELETED ---