rpms/ghostscript/devel CIDFnmap, 1.2, 1.3 ghostscript-Fontmap.local.patch, NONE, 1.1 FAPIcidfmap, 1.1, 1.2 cidfmap, 1.1, 1.2 ghostscript.spec, 1.135, 1.136

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17634

Modified Files:
	FAPIcidfmap cidfmap ghostscript.spec 
Added Files:
	CIDFnmap ghostscript-Fontmap.local.patch 
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
- New file CIDFmap (bug #233966).
- Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
- Resolves: rhbz#233966 rhbz#233966



Index: CIDFnmap
===================================================================
RCS file: CIDFnmap
diff -N CIDFnmap
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CIDFnmap	17 Apr 2007 10:05:22 -0000	1.3
@@ -0,0 +1,9 @@
+%!
+% following lines are for CJK fonts.
+(CIDFnmap.ja) .runlibfileifexists
+(CIDFnmap.ko) .runlibfileifexists
+(CIDFnmap.zh_CN) .runlibfileifexists
+(CIDFnmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(CIDFnmap.local) .runlibfileifexists
+

ghostscript-Fontmap.local.patch:
 Fontmap |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE ghostscript-Fontmap.local.patch ---
--- espgs-8.15.4/lib/Fontmap.Fontmap.local	2007-04-17 11:02:58.000000000 +0100
+++ espgs-8.15.4/lib/Fontmap	2007-04-17 11:03:16.000000000 +0100
@@ -2,3 +2,5 @@
 % See Fontmap.GS for the syntax of real Fontmap files.
 %% Replace 1 (Fontmap.GS)
 (Fontmap.GS) .runlibfile
+% must be at the bottom of line to allow people overriding everything.
+(Fontmap.local) .runlibfileifexists


Index: FAPIcidfmap
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/FAPIcidfmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FAPIcidfmap	13 Jul 2005 13:29:36 -0000	1.1
+++ FAPIcidfmap	17 Apr 2007 10:05:22 -0000	1.2
@@ -6,3 +6,5 @@
 (FAPIcidfmap.ko) .runlibfileifexists
 (FAPIcidfmap.zh_CN) .runlibfileifexists
 (FAPIcidfmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(FAPIcidfmap.local) .runlibfileifexists


Index: cidfmap
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/cidfmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cidfmap	15 Aug 2005 12:18:44 -0000	1.1
+++ cidfmap	17 Apr 2007 10:05:22 -0000	1.2
@@ -6,3 +6,5 @@
 (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) .runlibfileifexists


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ghostscript.spec	3 Apr 2007 13:39:01 -0000	1.135
+++ ghostscript.spec	17 Apr 2007 10:05:22 -0000	1.136
@@ -5,13 +5,14 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
 Group: Applications/Publishing
 Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{?gs_rc:gs_rc}-source.tar.bz2
 Source1: FAPIcidfmap
+Source2: CIDFnmap
 Source4: cidfmap
 
 Patch1: ghostscript-multilib.patch
@@ -21,6 +22,7 @@
 Patch5: ghostscript-split-cidfnmap.patch
 Patch6: ghostscript-gxcht-64bit-crash.patch
 Patch7: ghostscript-dvipdf.patch
+Patch8: ghostscript-Fontmap.local.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -95,6 +97,9 @@
 # dvipdf script fixes (bug #88906).
 %patch7 -p1 -b .dvipdf
 
+# Allow local overrides for Fontmap (bug #233966).
+%patch8 -p1 -b .Fontmap.local
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -174,6 +179,7 @@
 # Install our own FAPIcidfmap/cidfmap to allow the separated
 # FAPIcidfmap/cidfmap which the font packages own.
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/CIDFnmap
 install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap
 
 # Don't ship sysvlp.sh.
@@ -262,6 +268,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
+- New file CIDFmap (bug #233966).
+- Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-2
 - Fixed configuration file locations (bug #233966).