rpms/fonts-japanese/devel FAPIcidfmap.ja, 1.1, 1.2 fonts-japanese.spec, 1.7, 1.8 sources, 1.3, 1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 2 04:16:21 UTC 2005


Author: tagoh

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

Modified Files:
	FAPIcidfmap.ja fonts-japanese.spec sources 
Log Message:
* Tue Aug  2 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-6
- contain Sazanami fonts.


Index: FAPIcidfmap.ja
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/FAPIcidfmap.ja,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FAPIcidfmap.ja	14 Jul 2005 05:43:02 -0000	1.1
+++ FAPIcidfmap.ja	2 Aug 2005 04:16:14 -0000	1.2
@@ -22,9 +22,11 @@
 %
 % Use regular Postscript syntax.
 %
+/Sazanami-Mincho	<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic	<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
 /Kochi-Mincho		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
 /Kochi-Gothic		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/Adobe-Japan1		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/Adobe-Japan2		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ;
-/Ryumin-Light		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/GothicBBB-Medium	<< /Path (/usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Adobe-Japan1		<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Adobe-Japan2		<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ;
+/Ryumin-Light		<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/GothicBBB-Medium	<< /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fonts-japanese.spec	14 Jul 2005 05:43:02 -0000	1.7
+++ fonts-japanese.spec	2 Aug 2005 04:16:15 -0000	1.8
@@ -15,6 +15,7 @@
 %define substver	20030809
 %define kochisubst	%{substname}-%{substver}
 %define ksnonaga10	%{substname}-nonaga10-%{substver}
+#
 %define kappa		Kappa20-0.396
 %define shinonome	shinonome-0.9.11
 %define	warabi12	warabi12-0.19a
@@ -23,7 +24,7 @@
 
 Name:		fonts-japanese
 Version:	0.20050222
-Release:	5
+Release:	6
 License:	Distributable
 Group:		User Interface/X
 BuildArch:	noarch
@@ -31,12 +32,12 @@
 BuildRequires:	gzip xorg-x11-font-utils
 
 ## files in ttfonts-ja
-#Source0:	http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
-#Source1:	fonts.alias.sz
+Source0:	http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
+Source1:	fonts.alias.sz
 Source2:	FAPIcidfmap.ja
 ## FIXME: the below lines will be removed in the future.
 ## Source0:     http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2
-Source0:	%{ksnonaga10}.tar.bz2
+Source3:	%{ksnonaga10}.tar.bz2
 Source4:	fonts.alias.kk
 ## files in jisksp14
 Source10:	jisksp14.bdf.gz
@@ -97,7 +98,7 @@
 
 
 %prep
-%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
+%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
 ## ttfonts-ja
 ## jisksp14
 gunzip -c %{SOURCE10} > jisksp14.bdf
@@ -288,11 +289,19 @@
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## ttfonts-ja
-#pushd %{sazanami}
+pushd %{sazanami}
+install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
+popd
+#
 pushd %{kochisubst}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
+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
 
 ## jisksp14
@@ -354,7 +363,7 @@
 
 %files
 %defattr(-, root, root)
-#%%doc %{sazanami}/doc
+%doc %{sazanami}/doc
 %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
@@ -376,6 +385,9 @@
 %{cidmapdir}/FAPIcidfmap.ja
 
 %changelog
+* Tue Aug  2 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-6
+- contain Sazanami fonts.
+
 * Thu Jul 14 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-5
 - use FAPIcidfmap instead of CIDFnmap for gs8.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Feb 2005 09:12:33 -0000	1.3
+++ sources	2 Aug 2005 04:16:15 -0000	1.4
@@ -14,3 +14,4 @@
 e0e1d3b139159a2af09bc9867c9a654b  warabi12-0.19a.tar.gz
 fa5981d270f432d36818329c8878ba6e  xfonts_jp.tgz
 9ad6af617006bfa387fe2d376b3c7609  kochi-substitute-nonaga10-20030809.tar.bz2
+ceef10579a75c92483171f3bd7f77df2  sazanami-20040629.tar.bz2




More information about the fedora-cvs-commits mailing list