rpms/fonts-chinese/devel CIDFnmap.zh_CN, 1.3, 1.4 CIDFnmap.zh_TW, 1.3, 1.4 fonts-chinese.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12140

Modified Files:
	fonts-chinese.spec 
Added Files:
	CIDFnmap.zh_CN CIDFnmap.zh_TW 
Log Message:
Fixed bug 225526: [zh_*] need to add CIDFnmap file back (port el5=>rawhide)



Index: CIDFnmap.zh_CN
===================================================================
RCS file: CIDFnmap.zh_CN
diff -N CIDFnmap.zh_CN
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CIDFnmap.zh_CN	31 Jan 2007 04:42:54 -0000	1.4
@@ -0,0 +1,32 @@
+%!
+% Copyright (C) 2001 Taiji Yamada and gs-cjk project
+%
+% This file is part of GNU Ghostscript.
+% 
+% GNU Ghostscript is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY.  No author or distributor accepts responsibility
+% to anyone for the consequences of using it or for whether it serves any
+% particular purpose or works at all, unless he says so in writing. Refer
+% to the GNU General Public License for full details.
+% 
+% Everyone is granted permission to copy, modify and redistribute GNU
+% Ghostscript, but only under the conditions described in the GNU General
+% Public License.  A copy of this license is supposed to have been given
+% to you along with GNU Ghostscript so you can know your rights and
+% responsibilities.  It should be in a file named COPYING.  Among other
+% things, the copyright notice and this notice must be preserved on all
+% copies.
+
+% $Id$
+% CID fontmap for the Arphic trutype fonts
+
+% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE
+% for license information regarding these fonts.
+
+% Adobe-GB1
+
+/BousungEG-Light-GB	(/usr/share/fonts/chinese/TrueType/uming.ttf)	;
+/GBZenKai-Medium	(/usr/share/fonts/chinese/TrueType/ukai.ttf)	;
+
+/Adobe-GB1		/BousungEG-Light-GB	;
+/MSungGBK-Light		/BousungEG-Light-GB	;


Index: CIDFnmap.zh_TW
===================================================================
RCS file: CIDFnmap.zh_TW
diff -N CIDFnmap.zh_TW
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CIDFnmap.zh_TW	31 Jan 2007 04:42:54 -0000	1.4
@@ -0,0 +1,32 @@
+%!
+% Copyright (C) 2001 Taiji Yamada and gs-cjk project
+%
+% This file is part of GNU Ghostscript.
+% 
+% GNU Ghostscript is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY.  No author or distributor accepts responsibility
+% to anyone for the consequences of using it or for whether it serves any
+% particular purpose or works at all, unless he says so in writing. Refer
+% to the GNU General Public License for full details.
+% 
+% Everyone is granted permission to copy, modify and redistribute GNU
+% Ghostscript, but only under the conditions described in the GNU General
+% Public License.  A copy of this license is supposed to have been given
+% to you along with GNU Ghostscript so you can know your rights and
+% responsibilities.  It should be in a file named COPYING.  Among other
+% things, the copyright notice and this notice must be preserved on all
+% copies.
+
+% $Id$
+% CID fontmap for the Arphic trutype fonts
+
+% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE
+% for license information regarding these fonts.
+
+% Adobe-CNS1
+
+/ZenKai-Medium		(/usr/share/fonts/chinese/TrueType/ukai.ttf)	;
+/ShanHeiSun-Light	(/usr/share/fonts/chinese/TrueType/uming.ttf)	;
+
+/Adobe-CNS1		/ShanHeiSun-Light	;
+


Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fonts-chinese.spec	31 Jan 2007 03:04:50 -0000	1.28
+++ fonts-chinese.spec	31 Jan 2007 04:42:54 -0000	1.29
@@ -11,7 +11,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.03
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -34,6 +34,8 @@
 Source21:	FAPIcidfmap.zh_CN
 Source22:	cidfmap.zh_TW
 Source23:	cidfmap.zh_CN
+Source24:       CIDFnmap.zh_TW
+Source25:       CIDFnmap.zh_CN
 
 Requires(post): ttmkfdir >= 3.0.6, mkfontdir, fontconfig, /usr/sbin/chkfontpath
 Requires(postun): fontconfig, /usr/sbin/chkfontpath
@@ -78,10 +80,13 @@
 install -m 0644 %{SOURCE21} $RPM_BUILD_ROOT%{cidmapdir}/
 install -m 0644 %{SOURCE22} $RPM_BUILD_ROOT%{cidmapdir}/
 install -m 0644 %{SOURCE23} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 %{SOURCE24} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 %{SOURCE25} $RPM_BUILD_ROOT%{cidmapdir}/
 
 cp %{SOURCE10} %{SOURCE11} %{SOURCE12} $RPM_BUILD_DIR/%{name}-%{version}/doc/
 cp %{SOURCE13} $RPM_BUILD_DIR/%{name}-%{version}/doc/release.txt
 
+
 # for dummy
 touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
@@ -154,10 +159,17 @@
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
+%{cidmapdir}/CIDFnmap.zh_TW
+%{cidmapdir}/CIDFnmap.zh_CN
+
 
 %changelog
+* Wed Jan 31 2007 Caius Chance <cchance at redhat.com> - 3.03-3.fc7
+- Fixed bz#225526: [zh_*] need to add CIDFnmap file back (port el5=>rawhide)
+
 * Wed Jan 31 2007 Caius Chance <cchance at redhat.com> - 3.03-2.fc7
-- Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide)
+- Fixed bz#225523: Cannot use Chinese fonts on Java application with JRE 
+  (porting el5 => rawhide)
 
 * Thu Nov 09 2006 Caius Chance <cchance at redhat.com> - 3.03-1.fc7
 - Included new release of arphic uming & ukai (20060928).