rpms/fonts-japanese/devel CIDFnmap.ja, 1.5, 1.6 FAPIcidfmap.ja, 1.2, 1.3 cidfmap.ja, 1.1, 1.2 fonts-japanese.spec, 1.31, 1.32 sources, 1.6, 1.7
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Mon Aug 27 04:07:38 UTC 2007
Author: petersen
Update of /cvs/extras/rpms/fonts-japanese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27903
Modified Files:
CIDFnmap.ja FAPIcidfmap.ja cidfmap.ja fonts-japanese.spec
sources
Log Message:
sazanami fonts have been moved to a new package sazanami-fonts (#253149)
Index: CIDFnmap.ja
===================================================================
RCS file: /cvs/extras/rpms/fonts-japanese/devel/CIDFnmap.ja,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CIDFnmap.ja 24 Nov 2006 12:57:38 -0000 1.5
+++ CIDFnmap.ja 27 Aug 2007 04:07:05 -0000 1.6
@@ -45,8 +45,8 @@
% Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa.
% Kochi-Gothic: Wada Lab's font license.
%
-/Sazanami-Mincho (/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf) ;
-/Sazanami-Gothic (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) ;
+/Sazanami-Mincho (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) ;
+/Sazanami-Gothic (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) ;
/Adobe-Japan1 /Sazanami-Mincho ;
/Adobe-Japan2 /Sazanami-Gothic ;
Index: FAPIcidfmap.ja
===================================================================
RCS file: /cvs/extras/rpms/fonts-japanese/devel/FAPIcidfmap.ja,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FAPIcidfmap.ja 2 Aug 2005 04:16:14 -0000 1.2
+++ FAPIcidfmap.ja 27 Aug 2007 04:07:05 -0000 1.3
@@ -22,11 +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] >> ;
+/Sazanami-Mincho << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic << /Path (/usr/share/fonts/sazanami-fonts-gothic/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/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] >> ;
+/Adobe-Japan1 << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Adobe-Japan2 << /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ;
+/Ryumin-Light << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/GothicBBB-Medium << /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
Index: cidfmap.ja
===================================================================
RCS file: /cvs/extras/rpms/fonts-japanese/devel/cidfmap.ja,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cidfmap.ja 16 Aug 2005 12:05:50 -0000 1.1
+++ cidfmap.ja 27 Aug 2007 04:07:05 -0000 1.2
@@ -1,10 +1,10 @@
-/Sazanami-Gothic << /FileType /TrueType /Path (/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/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-JaH << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/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 << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/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-JaH << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ;
/Sazanami-Mincho-Regular-JaH /Sazanami-Mincho-JaH ;
/Ryumin-Light /Sazanami-Mincho ;
/GothicBBB-Medium /Sazanami-Gothic ;
Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fonts-japanese.spec 22 Aug 2007 09:13:50 -0000 1.31
+++ fonts-japanese.spec 27 Aug 2007 04:07:05 -0000 1.32
@@ -1,6 +1,5 @@
%define language japanese
%define basefontdir %{_datadir}/fonts/%{language}
-%define ttfontdir %{basefontdir}/TrueType
%define bmpfontdir %{basefontdir}/misc
%define cidmapdir %{_datadir}/ghostscript/conf.d
%define catalogue %{_sysconfdir}/X11/fontpath.d
@@ -9,7 +8,6 @@
%define mkbold $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold
%define mkitalic $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic
-%define sazanami sazanami-20061016
%define kappa Kappa20-0.396
%define shinonome shinonome-0.9.11
%define warabi12 warabi12-0.19a
@@ -18,18 +16,16 @@
Name: fonts-japanese
Version: 0.20061016
-Release: 9%{?dist}
-License: BSD and Public Domain and GPL+ and mplus
+Release: 10%{?dist}
+License: Public Domain and GPL+ and BSD and mplus
Group: User Interface/X
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gzip xorg-x11-font-utils mkfontdir gawk
BuildRequires: ttmkfdir >= 3.0.6
+Requires: sazanami-fonts-gothic sazanami-fonts-mincho
## files in ttfonts-ja
-### Licensed under BSD
-Source0: http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
-Source1: fonts.alias.sz
Source2: FAPIcidfmap.ja
Source3: cidfmap.ja
Source4: CIDFnmap.ja
@@ -94,18 +90,18 @@
Patch54: fonttools-replace.patch
-Summary: Free Japanese Bitmap/TrueType fonts
+Summary: Free Japanese Bitmap fonts
Provides: ttfonts-ja = 1.2-37, jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16
Obsoletes: ttfonts-ja <= 1.2-37, jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16
%description
-This package provides the free Japanese Bitmap/TrueType fonts.
+This package provides various free Japanese Bitmap fonts.
%prep
-#%%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
+#%%setup -q -T -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 -T -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
@@ -291,16 +287,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{ttfontdir}
install -d $RPM_BUILD_ROOT%{bmpfontdir}
install -d $RPM_BUILD_ROOT%{cidmapdir}
-## ttfonts-ja
-pushd %{sazanami}
-install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-popd
-
## jisksp14
install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
@@ -327,12 +316,9 @@
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
# Create fonts.scale and fonts.dir
-/usr/bin/ttmkfdir -d $RPM_BUILD_ROOT%{ttfontdir} -o $RPM_BUILD_ROOT%{ttfontdir}/fonts.scale
-/usr/bin/mkfontdir $RPM_BUILD_ROOT%{ttfontdir}
/usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
# for dummy
touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
@@ -340,7 +326,6 @@
# Install catalogue symlink
install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-japanese-ttf
ln -sf %{bmpfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-japanese-bitmap
%clean
@@ -360,23 +345,16 @@
%files
%defattr(-, root, root)
-%doc %{sazanami}/doc
%doc doc.orig readme.kaname_bdf
%doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
%dir %{basefontdir}
-%dir %{ttfontdir}
%dir %{bmpfontdir}
%dir %{cidmapdir}
-%verify(not md5 size mtime) %{ttfontdir}/fonts.alias
-%verify(not md5 size mtime) %{ttfontdir}/fonts.dir
-%verify(not md5 size mtime) %{ttfontdir}/fonts.scale
%verify(not md5 size mtime) %{bmpfontdir}/fonts.alias
%verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1
%ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.cache-1
%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
-%{ttfontdir}/*ttf
%{bmpfontdir}/*gz
%{cidmapdir}/FAPIcidfmap.ja
%{cidmapdir}/cidfmap.ja
@@ -384,6 +362,9 @@
%{catalogue}/*
%changelog
+* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 0.20061016-10
+- sazanami fonts have been moved to a new package sazanami-fonts (#253149)
+
* Wed Aug 22 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-9
- No need to own /etc/X11/fontpath.d.
- Update BR.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fonts-japanese/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 1 Mar 2007 13:35:38 -0000 1.6
+++ sources 27 Aug 2007 04:07:05 -0000 1.7
@@ -12,5 +12,4 @@
c6b7771e4f00e310fe807b3245fd316e vine-fonttools-0.1.tgz
e0e1d3b139159a2af09bc9867c9a654b warabi12-0.19a.tar.gz
fa5981d270f432d36818329c8878ba6e xfonts_jp.tgz
-b312f77829011547b19fc16956dc6f12 sazanami-20061016.tar.bz2
a97a99acbee54976407dec828d03850c mplus_bitmap_fonts-2.2.4.tar.gz
More information about the fedora-extras-commits
mailing list