rpms/fonts-japanese/devel cidfmap.ja, NONE, 1.1 fonts-japanese.spec, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: tagoh

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

Modified Files:
	fonts-japanese.spec 
Added Files:
	cidfmap.ja 
Log Message:
* Tue Aug 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-7
- Added cidfmap.ja for the latest ghostscript.
- Removed Kochi fonts.


--- NEW FILE cidfmap.ja ---
/Sazanami-Gothic	<< /FileType /TrueType /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ;
/Sazanami-Gothic-Regular	/Sazanami-Gothic ;
/Sazanami-Gothic-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ;
/Sazanami-Gothic-Regular-JaH	/Sazanami-Gothic-JaH ;
/Sazanami-Mincho	<< /FileType /TrueType /Path (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) /CSI [(Japan1) 6] >> ;
/Sazanami-Mincho-Regular	/Sazanami-Mincho ;
/Sazanami-Mincho-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ;
/Sazanami-Mincho-Regular-JaH	/Sazanami-Mincho-JaH ;
/Ryumin-Light		/Sazanami-Mincho ;
/GothicBBB-Medium	/Sazanami-Gothic ;
/Adobe-Japan1		/Sazanami-Gothic ;
/Adobe-Japan2		/Sazanami-Gothic-JaH ;


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fonts-japanese.spec	2 Aug 2005 04:16:15 -0000	1.8
+++ fonts-japanese.spec	16 Aug 2005 12:05:50 -0000	1.9
@@ -11,10 +11,10 @@
 
 %define sazanami	sazanami-20040629
 ## FIXME: the below lines will be removed in the future.
-%define substname	kochi-substitute
-%define substver	20030809
-%define kochisubst	%{substname}-%{substver}
-%define ksnonaga10	%{substname}-nonaga10-%{substver}
+#%%define substname	kochi-substitute
+#%%define substver	20030809
+#%%define kochisubst	%{substname}-%{substver}
+#%%define ksnonaga10	%{substname}-nonaga10-%{substver}
 #
 %define kappa		Kappa20-0.396
 %define shinonome	shinonome-0.9.11
@@ -24,7 +24,7 @@
 
 Name:		fonts-japanese
 Version:	0.20050222
-Release:	6
+Release:	7
 License:	Distributable
 Group:		User Interface/X
 BuildArch:	noarch
@@ -35,10 +35,11 @@
 Source0:	http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
 Source1:	fonts.alias.sz
 Source2:	FAPIcidfmap.ja
+Source3:	cidfmap.ja
 ## FIXME: the below lines will be removed in the future.
 ## Source0:     http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2
-Source3:	%{ksnonaga10}.tar.bz2
-Source4:	fonts.alias.kk
+#Source5:	%{ksnonaga10}.tar.bz2
+#Source6:	fonts.alias.kk
 ## files in jisksp14
 Source10:	jisksp14.bdf.gz
 ## files in jisksp16-1990
@@ -98,7 +99,8 @@
 
 
 %prep
-%setup -q -c -a 3 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
+#%%setup -q -c -a 5 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
+%setup -q -c -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
 ## ttfonts-ja
 ## jisksp14
 gunzip -c %{SOURCE10} > jisksp14.bdf
@@ -294,15 +296,15 @@
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
 popd
 #
-pushd %{kochisubst}
-install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-if test -f $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias; then
-  cat $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias %{SOURCE4} > $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias.$$$ && mv $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias{.$$$,} || exit
-  chmod 0644 $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-else
-  install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-fi
-popd
+#pushd %{kochisubst}
+#install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
+#if test -f $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias; then
+#  cat $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias %{SOURCE6} > $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias.$$$ && mv $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias{.$$$,} || exit
+#  chmod 0644 $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
+#else
+#  install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
+#fi
+#popd
 
 ## jisksp14
 install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
@@ -326,6 +328,7 @@
 
 # for ghostscript
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # for dummy
 touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
@@ -364,7 +367,7 @@
 %files
 %defattr(-, root, root)
 %doc %{sazanami}/doc
-%doc %{kochisubst}/docs %{kochisubst}/{COPYING,README.ja,README.RedHat}
+#%%doc %{kochisubst}/docs %{kochisubst}/{COPYING,README.ja,README.RedHat}
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{basefontdir}
@@ -383,8 +386,13 @@
 %{ttfontdir}/*ttf
 %{bmpfontdir}
 %{cidmapdir}/FAPIcidfmap.ja
+%{cidmapdir}/cidfmap.ja
 
 %changelog
+* Tue Aug 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-7
+- Added cidfmap.ja for the latest ghostscript.
+- Removed Kochi fonts.
+
 * Tue Aug  2 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-6
 - contain Sazanami fonts.