From 23f365591fa5eb95d9a928c109efd596d68ae455 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Jul 10 2008 02:46:05 +0000 Subject: - Renamed package from fonts-japanese. (#253149) - Get rid of ttf font packages' dependencies. - clean up the spec file a bit. --- diff --git a/.cvsignore b/.cvsignore index e69de29..9b362bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,17 @@ +*.bz2 +*.gz +*.rpm +Kappa20-0.396.tar.bz2 +shinonome-0.9.11-src.tar.bz2 +imamura-jisx0213.tgz +jiskan24-2000-1.bdf.gz +jiskan24-2000-2.bdf.gz +jiskan24-2003-1.bdf.gz +jisksp14.bdf.gz +k14-oldkanji.tar.gz +kaname_k12_bdf.tar.gz +marumoji.tgz +mplus_bitmap_fonts-2.2.4.tar.gz +vine-fonttools-0.1.tgz +warabi12-0.19a.tar.gz +xfonts_jp.tgz diff --git a/CIDFnmap.ja b/CIDFnmap.ja new file mode 100644 index 0000000..18b6c5f --- /dev/null +++ b/CIDFnmap.ja @@ -0,0 +1,55 @@ +%! +% 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 Kochi truetype fonts + +% Kochi Mincho (aka Watanabe-Light) font series and +% Kochi Gothic (aka Kochi-WadaLabGothic) font series for Adobe-Japan1 + +% Kochi Mincho and Gothic - TrueType +% Editor: Yasuyuki Furukawa +% URL: http://www.on.cs.keio.ac.jp/~yasu/linux/fonts/ +% +% Kochi-Mincho: Public domain, except for NAGA10 bitmap data +% Kochi-Gothic: Wada Lab's font license, except for NAGA10 bitmap data +% +%/Kochi-Mincho (kochi-mincho.ttf) ; +%/Kochi-Gothic (kochi-gothic.ttf) ; +% +% Notice: In CID-keyed space of Kochi-Mincho, although you may find that +% CIDs 7611,7613-7625,7629,7630,11847,12041-12043 are incorrectly +% assigned from glyph IDs, it is because that these are for WORKING AREA +% to develop "kochi-mincho.ttf" font for the time being. + +% Kochi Mincho and Gothic - CIDFontType 0 +% Author: KANOU Hiroki +% URL: http://kappa.allnet.ne.jp/Kochi-CID/index-e.html +% +% Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa. +% Kochi-Gothic: Wada Lab's font license. +% +/Sazanami-Mincho (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) ; +/Sazanami-Gothic (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) ; +/VL-Gothic (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) ; + +/Adobe-Japan1 /Sazanami-Mincho ; +/Adobe-Japan2 /VL-Gothic ; +/Ryumin-Light /Sazanami-Mincho ; +/GothicBBB-Medium /VL-Gothic ; diff --git a/FAPIcidfmap.ja b/FAPIcidfmap.ja new file mode 100644 index 0000000..068c684 --- /dev/null +++ b/FAPIcidfmap.ja @@ -0,0 +1,33 @@ +%! +% The map is a set of records like this : +% +% /CIDfont_name options_dict ; +% +% where options_dict is a dictionary with the following entries : +% +% Key Type Description +% Path string Absolute path to font file, or relative path to font file from +% the GS_EXTFONTPATH value. +% CIDFontType integer PostScript type for this CID font. Only 0 is currently allowed. +% Note that this is unrelated to the real type of the font file - +% the bridge will perform format conversion. +% FAPI name Name of the renderer to be used with the font. /AgfaUFST and +% /FreeType is now allowed -- depends on which options Ghostscript +% was built with. +% SubfontId integer (optional) Index of the font in font collection, such as FCO or TTC. +% It is being ignored if /Path doesn't specify a collection. +% CSI array Must have strongly 2 elements. +% The first element of the array specifies Ordering of CIDSystemInfo. +% The second element specifies Supplement of CIDSystemInfo. +% +% Use regular Postscript syntax. +% +/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] >> ; +/VL-Gothic << /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.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/VLGothic/VL-Gothic-Regular.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/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; diff --git a/cidfmap.ja b/cidfmap.ja new file mode 100644 index 0000000..7dcf113 --- /dev/null +++ b/cidfmap.ja @@ -0,0 +1,16 @@ +/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/sazanami-fonts-gothic/sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ; +/Sazanami-Gothic-Regular-JaH /Sazanami-Gothic-JaH ; +/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/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ; +/Sazanami-Mincho-Regular-JaH /Sazanami-Mincho-JaH ; +/VL-Gothic << /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ; +/VL-Gothic-Regular /VL-Gothic ; +/VL-Gothic-JaH << /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ; +/VL-Gothic-Regular-JaH /VL-Gothic-JaH ; +/Ryumin-Light /Sazanami-Mincho ; +/GothicBBB-Medium /VL-Gothic ; +/Adobe-Japan1 /VL-Gothic ; +/Adobe-Japan2 /VL-Gothic-JaH ; diff --git a/fonts-ja-8.0-gcc-warnings.patch b/fonts-ja-8.0-gcc-warnings.patch new file mode 100644 index 0000000..964e542 --- /dev/null +++ b/fonts-ja-8.0-gcc-warnings.patch @@ -0,0 +1,12 @@ +diff -ruN fonts-ja-8.0.orig/vine-fonttools-0.1/mkitalic.c fonts-ja-8.0/vine-fonttools-0.1/mkitalic.c +--- fonts-ja-8.0.orig/vine-fonttools-0.1/mkitalic.c 2000-12-23 03:59:33.000000000 +0900 ++++ fonts-ja-8.0/vine-fonttools-0.1/mkitalic.c 2004-02-23 18:48:53.000000000 +0900 +@@ -316,7 +316,7 @@ + { + + char* tmp,tmp2,tok; +- char hexcbuf[3]; ++ char hexcbuf[4]; + int height,width,newwidth,newbw; + int ox, oy, newox, newoy; + int count, shift, oldshift, x, i, j, k; diff --git a/fonttools-replace.patch b/fonttools-replace.patch new file mode 100644 index 0000000..8b0fb52 --- /dev/null +++ b/fonttools-replace.patch @@ -0,0 +1,28 @@ +diff -ruN fonts-ja-8.0.orig/vine-fonttools-0.1/mkalias.pl fonts-ja-8.0/vine-fonttools-0.1/mkalias.pl +--- fonts-ja-8.0.orig/vine-fonttools-0.1/mkalias.pl 2004-06-22 20:56:42.203463923 +0900 ++++ fonts-ja-8.0/vine-fonttools-0.1/mkalias.pl 2004-06-22 20:57:12.356476700 +0900 +@@ -54,14 +54,22 @@ + for ($j=0; $j < $defcnt; $j++) { + $file[$j] = $ARGV[$i+2+$j]; + if ( $file[$j] ne "-" ){ +- die "invalid file $file[$j]\n" if ( ! $realxlfd{$file[$j]} ); ++ if ( $file[$j] !~ /WEIGHT/ ) { ++ die "invalid file $file[$j]\n" if ( ! $realxlfd{$file[$j]} ); ++ } + } + } + + foreach $m ("", "b", "i", "bi") { + for ($j=0; $j < $defcnt; $j++) { + $file[$j] = $ARGV[$i+2+$j]; +- if ( $file[$j] ne "-" ) { ++ if ( $file[$j] =~ /WEIGHT/ ) { ++ $f = $file[$j]; ++ $f =~ s/WEIGHT/$m/; ++ die "invalid file $f\n" if ( ! $realxlfd{$f} ); ++ modify($afndry[$j], $afmly[$j], $charset, ++ $pixel, $realxlfd{$f}); ++ } elsif ( $file[$j] ne "-" ) { + modify($afndry[$j], $afmly[$j], $charset, + $pixel, $realxlfd{$file[$j].$m}); + } diff --git a/japanese-bitmap-fonts.spec b/japanese-bitmap-fonts.spec new file mode 100644 index 0000000..98c8682 --- /dev/null +++ b/japanese-bitmap-fonts.spec @@ -0,0 +1,470 @@ +%define fontname %{name} +%define fontdir %{_datadir}/fonts/%{fontname} +%define cataloguedir %{_sysconfdir}/X11/fontpath.d +%define cidmapdir %{_datadir}/ghostscript/conf.d + +%define chxlfd /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl +%define mkalias /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl +%define mkbold $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold +%define mkitalic $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic + +%define kappa Kappa20-0.396 +%define shinonome shinonome-0.9.11 +%define warabi12 warabi12-0.19a +%define mplus mplus_bitmap_fonts-2.2.4 +%define vft vine-fonttools-0.1 + +Name: japanese-bitmap-fonts +Version: 0.20080710 +Release: 1%{?dist} +License: Public Domain and BSD and mplus +Group: User Interface/X +BuildArch: noarch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: xorg-x11-font-utils mkfontdir gawk + +## files in ttfonts-ja +Source2: FAPIcidfmap.ja +Source3: cidfmap.ja +Source4: CIDFnmap.ja +## files in jisksp14 +### Licensed under Public Domain +Source10: jisksp14.bdf.gz +## files in kaname +### Licensed under Public Domain +Source41: ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz +## files in fonts-ja +Source50: xfonts_jp.tgz +### Licensed under Public Domain +Source51: http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2 +### Licensed under Public Domain +Source52: http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2 +## http://mlnews.com/marumoji/ +### Licensed under Public Domain +Source53: marumoji.tgz +# JIS X 0213-2000 fonts (14pxl, 16pxl) +# http://www.mars.sphere.ne.jp/imamura/jisx0213.html +# http://www.mars.sphere.ne.jp/imamura/K14-1.bdf.gz +# http://www.mars.sphere.ne.jp/imamura/K14-2.bdf.gz +# http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-1.bdf.gz +# http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-2.bdf.gz +### Licensed under Public Domain +Source54: imamura-jisx0213.tgz +# jiskan16 JIS X 0208:1990 by Yasuoka +# http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/ +### Licensed under Public Domain +Source55: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z +# jiskan16 JIS X 0208:1997 Old Kanji +### Licensed under Public Domain +Source56: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z +# k14 Old-Kanji +### Licensed under Public Domain +Source57: http://www.hlla.is.tsukuba.ac.jp/~kourai/software/k14-oldkanji.tar.gz +## k14 invalid glyphs patch +## http://kappa.allnet.ne.jp/kanou/fonts/k14-patch.html +# Warabi12 (12pxl) jisx0213 +# http://www.gelgoog.org/warabi12/ +### Licensed under BSD +Source58: http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz +# mplus fonts +# http://mplus-fonts.sourceforge.jp/ +### Licensed under mplus +Source59: http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz +Source60: %{vft}.tgz +# jiskan24 JIS X 0213 +# http://gitatsu.hp.infoseek.co.jp/bdf/ +### Licensed under Public Domain +Source61: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2000-1.bdf.gz +Source62: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2000-2.bdf.gz +Source63: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2003-1.bdf.gz + +Patch50: http://kappa.allnet.ne.jp/kanou/fonts/k14.patch +# k14 to jisx0208.1990 patch +# http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/ +# http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/patch.txt +Patch51: k14-1990.patch +Patch52: fonts-ja-8.0-gcc-warnings.patch +Patch53: mplus_bitmap_fonts-install.patch +Patch54: fonttools-replace.patch + + +Summary: Free Japanese Bitmap fonts + +Provides: jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16, fonts-japanese = 0.20061016-13 +Obsoletes: jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16, fonts-japanese <= 0.20061016-13 + +%description +This package provides various free Japanese Bitmap fonts. + + +%prep +#%%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 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 +## kappa20 +## fonts-ja +gunzip -c %{SOURCE55} > jiskan16-1990.bdf +gunzip -c %{SOURCE56} > jiskano16-1997.bdf +%patch50 -p0 +cp k14.bdf k14-1990.bdf +%patch51 -p0 +%patch52 -p1 +pushd %{mplus} +%patch53 -p1 +popd +%patch54 -p1 +zcat %{SOURCE61} > jiskan24-2000-1.bdf +zcat %{SOURCE62} > jiskan24-2000-2.bdf +zcat %{SOURCE63} > jiskan24-2003-1.bdf + +%build +## jisksp14 +bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz +## kappa20 +## fonts-ja +pushd %{shinonome}-src +%configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir} +make bdf +popd +### rename Kappa and remove the bold fonts +pushd %{kappa} + mv k20m.bdf k20.bdf + mv 10x20rkm.bdf 10x20rk.bdf + rm k20b.bdf 10x20rkb.bdf +popd +### rename in xfonts_jp +mv 7x14.bdf 7x14a.bdf +mv 8x16.bdf 8x16a.bdf +mv 12x24.bdf 12x24a.bdf +### marumoji +pushd marumoji + for i in *.bdf; do + %{chxlfd} $i '-Marumoji Club-Marumoji-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv -f $i.new $i + done +popd +### imamura jiskan16 +pushd imamura-jisx0213 + for i in *.bdf; do + %{chxlfd} $i '-Imamura-Fixed-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv -f $i.new $i + done + mv K14-1.bdf k14-2000-1.bdf + mv K14-2.bdf k14-2000-2.bdf +popd +### k14 and k14-1990 is used as Mincho +for i in k14.bdf k14-1990.bdf; do + %{chxlfd} $i '-Misc-Mincho-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv $i.new $i +done +### oldkanji +rm k14-oldkanji.pcf* +for i in k14-oldkanji.bdf jiskano16-1997.bdf; do + %{chxlfd} $i '-Misc-.-.-.-.-Old Style-.-.-.-.-.-.-.-.' $i.new && mv $i.new $i +done +### warabi12 +pushd %{warabi12} + mv warabi12-1.bdf warabi12-2000-1.bdf +popd +### mplus +pushd %{mplus} + DESTDIR=`pwd`/tmp/ ./install_mplus_fonts +popd + +### move bdfs to topdir +mkdir fonts-ja +find -name "*.bdf" -path "./*/*" ! -path "./fonts-ja/*" ! -path "./fonts/*" -exec mv {} ./fonts-ja \; +mv k14-oldkanji.bdf jiskano16-1997.bdf k14-1990.bdf jiskan16-1990.bdf 7x14a.bdf 7x14rk.bdf 12x24a.bdf 12x24rk.bdf 8x16a.bdf 8x16rk.bdf k14.bdf jiskan16.bdf jiskan24*.bdf ./fonts-ja/ +### move the documents to topdir +for i in */README */COPYRIGHT */{LICENSE,README}_{E,J}; do + mv $i fonts-ja/`basename $i`-`dirname $i` +done + +ALL_MEDIUM_BDF_FONT="\ + shnmk12maru/ maru14/-L maru16/ \ + k14-oldkanji/ jiskano16-1997/ \ + k14-1990/-L jiskan16-1990/ \ + warabi12-2000-1/ \ + k14-2000-1/-L k14-2000-2/-L \ + jiskan16-2000-1/ jiskan16-2000-2/ \ + shnm6x12a/-r shnm6x12r/-r shnmk12/ shnmk12p/ shnmk12min/ \ + shnm8x16a/-r shnm8x16r/-r shnmk16/ shnmk16min/ \ + 7x14a/ 7x14rk/ shnmk14/ k14/-L shnmk14min/ \ + 8x16a/ 8x16rk/ jiskan16/ \ + shnm9x18a/-r shnm9x18r/-r \ + 10x20rk/ k20/ \ + 12x24a/ 12x24rk/ jiskan24/ \ + jiskan24-2000-1/ jiskan24-2000-2/ jiskan24-2003-1/ +" +ALL_BOLD_BDF_FONT="\ +mplus_f10WEIGHT-euro/-r mplus_f10WEIGHT/-r \ +mplus_f12WEIGHT-euro/-r mplus_f12WEIGHT-jisx0201/-r mplus_f12WEIGHT/-r \ +mplus_h10WEIGHT-euro/-r mplus_h10WEIGHT-jisx0201/-r mplus_h10WEIGHT/-r \ +mplus_h12WEIGHT-euro/-r mplus_h12WEIGHT-jisx0201/-r mplus_h12WEIGHT/-r \ +mplus_j10WEIGHT-iso/-r mplus_j10WEIGHT-jisx0201/-r mplus_j10WEIGHT/-r \ +mplus_j12WEIGHT/-r \ +mplus_s10WEIGHT-euro/-r mplus_s10WEIGHT/-r +" +gcc $RPM_OPT_FLAGS %{vft}/mkitalic.c -o %{vft}/mkitalic + +pushd fonts-ja +### delete 'r' from the filenames +for src in $ALL_BOLD_BDF_FONT; do + mv `echo ${src%/*}.bdf | sed -e 's/WEIGHT/r/'` `echo ${src%/*}.bdf | sed -e 's/WEIGHT//'` +done + +### making roman-bold fonts +for src in $ALL_MEDIUM_BDF_FONT; do + %{mkbold} ${src#*/} -V ${src%/*}.bdf > ${src%/*}b.bdf +done +### making italic-medium fonts +for src in $ALL_MEDIUM_BDF_FONT; do + %{mkitalic} -s 0.2 ${src%/*}.bdf > ${src%/*}i.bdf +done +for src in $ALL_BOLD_BDF_FONT; do + %{mkitalic} -s 0.2 `echo ${src%/*}.bdf | sed -e 's/WEIGHT//'` > `echo ${src%/*}.bdf | sed -e 's/WEIGHT/i/'` +done +### making italic-bold fonts +for src in $ALL_MEDIUM_BDF_FONT; do + %{mkbold} ${src#*/} -V ${src%/*}i.bdf > ${src%/*}bi.bdf +done +for src in $ALL_BOLD_BDF_FONT; do + %{mkitalic} -s 0.2 `echo ${src%/*}.bdf | sed -e 's/WEIGHT/b/'` > `echo ${src%/*}.bdf | sed -e 's/WEIGHT/bi/'` +done + +grep '^FONT ' *.bdf | sed -e 's/\.bdf:FONT//' > ALLFONTS.txt + +### check the duplicated xlfds +DUP="`cut -d' ' -f2- ALLFONTS.txt | sort | uniq -d`" +if [ ! -z "$DUP" ]; then + echo Duplicated XLFDs found. Please fix. + echo ----------------------------------------- + echo "$DUP" + exit 1 +fi + +cp ALLFONTS.txt mkalias.dat +# CHARSET PXL MISC FIXED MINCHO GOTHIC +# now, pixel 10 jisx0201 and pixel 20 gothic, +# pixel 12 jisx0201 and pixel 24 gothic does not exist (fake) +%{mkalias} Misc-Fixed Alias-Fixed Alias-Gothic Alias-Mincho - \ +ISO8859-1 10 mplus_f10WEIGHT mplus_f10WEIGHT mplus_j10WEIGHT - \ +ISO8859-1 12 shnm6x12a shnm6x12a shnm6x12a shnm6x12a \ +ISO8859-1 14 7x14a 7x14a 7x14a 7x14a \ +ISO8859-1 16 shnm8x16a shnm8x16a shnm8x16a shnm8x16a \ +ISO8859-1 18 shnm9x18a shnm9x18a shnm9x18a shnm9x18a \ +ISO8859-1 20 10x20rk 10x20rk - 10x20rk \ +ISO8859-1 24 12x24a 12x24a - 12x24a \ +JISX0201.1976-0 10 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 \ +JISX0201.1976-0 12 shnm6x12r shnm6x12r shnm6x12r shnm6x12r \ +JISX0201.1976-0 14 7x14rk 7x14rk 7x14rk 7x14rk \ +JISX0201.1976-0 16 shnm8x16r shnm8x16r shnm8x16r shnm8x16r \ +JISX0201.1976-0 18 shnm9x18r shnm9x18r shnm9x18r shnm9x18r \ +JISX0201.1976-0 20 10x20rk 10x20rk - 10x20rk \ +JISX0201.1976-0 24 12x24rk 12x24rk - 12x24rk \ +JISX0208.1983-0 10 mplus_j10WEIGHT mplus_j10WEIGHT mplus_j10WEIGHT - \ +JISX0208.1983-0 12 shnmk12 shnmk12 shnmk12 shnmk12min \ +JISX0208.1983-0 14 shnmk14 shnmk14 shnmk14 k14 \ +JISX0208.1983-0 16 shnmk16 shnmk16 shnmk16 shnmk16min \ +JISX0208.1983-0 20 - - - k20 \ +JISX0208.1983-0 24 - - - jiskan24 \ +JISX0208.1990-0 10 mplus_j10WEIGHT mplus_j10WEIGHT mplus_j10WEIGHT - \ +JISX0213.2000-1 12 warabi12-2000-1 warabi12-2000-1 warabi12-2000-1 warabi12-2000-1 \ +JISX0213.2000-1 14 k14-2000-1 k14-2000-1 k14-2000-1 k14-2000-1 \ +JISX0213.2000-2 14 k14-2000-2 k14-2000-2 k14-2000-2 k14-2000-2 \ +JISX0213.2000-1 16 jiskan16-2000-1 jiskan16-2000-1 jiskan16-2000-1 jiskan16-2000-1 \ +JISX0213.2000-2 16 jiskan16-2000-2 jiskan16-2000-2 jiskan16-2000-2 jiskan16-2000-2 \ +JISX0213.2000-1 24 jiskan24-2000-1 jiskan24-2000-1 jiskan24-2000-1 jiskan24-2000-1 \ +JISX0213.2000-2 24 jiskan24-2000-2 jiskan24-2000-2 jiskan24-2000-2 jiskan24-2000-2 \ +JISX0213.2003-1 24 jiskan24-2003-1 jiskan24-2003-1 jiskan24-2003-1 jiskan24-2003-1 \ +> fonts.alias +mkdir BDFS +for src in *.bdf; do + bdftopcf $src | gzip -9 > ${src%.bdf}.pcf.gz && mv $src BDFS/ +done +popd + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{bmpfontdir} +install -d $RPM_BUILD_ROOT%{cidmapdir} + +## jisksp14 +install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/ + +## kappa20 + +## knm_new +for i in knmhn12x.bdf fonts/kaname-latin1.bdf fonts/knm12p.bdf fonts/knm12pb.bdf fonts/knmzn12x.bdf fonts/knmzn12xb.bdf; do + bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'` +done + +## fonts-ja +### remove an unnecessary file +rm -f fonts-ja/mplus_cursors.pcf.gz +for i in fonts-ja/*.pcf.gz; do + install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i` +done + +# for ghostscript +install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/ +install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/ +install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/ + +# Create fonts.scale and fonts.dir +/usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir} +# for dummy +touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1 +touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1 +touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir + +install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ + +# Install catalogue symlink +install -d $RPM_BUILD_ROOT%{catalogue} +ln -sf %{bmpfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +umask 133 +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{fontdir} || : +fi + +%postun +umask 133 +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{fontdir} || : + fi +fi + +%files +%defattr(0644, root, root, 0755) +%doc doc.orig readme.kaname_bdf +%doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt +%dir %{fontdir} +%dir %{cidmapdir} +%verify(not md5 size mtime) %{bmpfontdir}/fonts.alias +%verify(not md5 size mtime) %{bmpfontdir}/fonts.dir +%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir +%{fontdir}/*gz +%{cidmapdir}/FAPIcidfmap.ja +%{cidmapdir}/cidfmap.ja +%{cidmapdir}/CIDFnmap.ja +%{catalogue}/* + +%changelog +* Thu Jul 10 2008 Akira TAGOH - 0.20080710-1 +- Renamed package from fonts-japanese. (#253149) +- Get rid of ttf font packages' dependencies. +- clean up the spec file a bit. + +* Tue Apr 8 2008 Akira TAGOH - 0.20061016-13 +- Add VLGothic-fonts deps and drop sazanami-fonts-gothic. + +* Wed Sep 26 2007 Akira TAGOH - 0.20061016-12 +- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately. +- clean up the spec file. + +* Fri Aug 31 2007 Akira TAGOH +- Add jiskan24-2000-{1,2} and jiskan24-2003-1. + +* Thu Aug 30 2007 Akira TAGOH +- drop BR gzip + +* Wed Aug 29 2007 Akira TAGOH +- clean up the spec file. + +* Tue Aug 28 2007 Jens Petersen - 0.20061016-11 +- use the standard font scriptlets (Michal Jaegermann, #259041) + +* Mon Aug 27 2007 Jens Petersen - 0.20061016-10 +- sazanami fonts have been moved to a new package sazanami-fonts (#253149) + +* Wed Aug 22 2007 Akira TAGOH - 0.20061016-9 +- No need to own /etc/X11/fontpath.d. +- Update BR. + +* Wed Aug 15 2007 Akira TAGOH - 0.20061016-8 +- Migrate to /etc/X11/fontpath.d instead of running chkfontpath. (#252275) +- Generate fonts.dir at the build time instead of the runtime. +- Drop fc-cache dependency since it's a conditional scriptlet. + +* Tue Aug 14 2007 Akira TAGOH +- Update License tag. + +* Thu Apr 12 2007 Akira TAGOH - 0.20061016-6 +- Remove %%config from the files under /usr/share/ghostscript/conf.d. +- clean up more in spec file. + +* Tue Apr 10 2007 Akira TAGOH - 0.20061016-5 +- Move the configuration files for ghostscript under /usr/share/ghostscript/conf.d + +* Fri Mar 15 2007 Akira TAGOH - 0.20061016-4 +- more cleanups. (#225765) + +* Thu Mar 1 2007 Akira TAGOH - 0.20061016-3 +- cleanup spec file. +- updated mplus to 2.2.4 + +* Fri Nov 24 2006 Akira TAGOH - 0.20061016-2 +- added CIDFnmap.ja (#215980) + +* Fri Oct 27 2006 Akira TAGOH - 0.20061016-1 +- correct U+7E6B. (#196433) + +* Wed Jul 12 2006 Jesse Keating - 0.20050222-11.1.1 +- rebuild + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 17 2005 Warren Togami - 0.20050222-11 +- split req(foo,bar) for erasure ordering + +* Tue Nov 15 2005 Jeremy Katz - 0.20050222-10 +- better mkfontdir + +* Mon Nov 14 2005 Warren Togami - 0.20050222-9 +- rebuild against modular X + +* Mon Nov 7 2005 Akira TAGOH - 0.20050222-8 +- rely on PATH to find mkfontdir instead of /usr/X11R6/bin hardcoded. +- replace Requires: mkfontdir instead of /usr/X11R6/bin/mkfontdir. + +* Tue Aug 16 2005 Akira TAGOH - 0.20050222-7 +- Added cidfmap.ja for the latest ghostscript. +- Removed Kochi fonts. + +* Tue Aug 2 2005 Akira TAGOH - 0.20050222-6 +- contain Sazanami fonts. + +* Thu Jul 14 2005 Akira TAGOH - 0.20050222-5 +- use FAPIcidfmap instead of CIDFnmap for gs8. + +* Thu Jun 9 2005 Akira TAGOH - 0.20050222-4 +- removed VFlib2 dependency. + +* Wed Apr 20 2005 Akira TAGOH - 0.20050222-3 +- Updated the font path in CIDFnmap.ja (John Thacker, #155403) + +* Thu Feb 24 2005 Akira TAGOH - 0.20050222-2 +- Use /usr/share/fonts/japanese instead of /usr/share/fonts/ja + +* Tue Feb 22 2005 Akira TAGOH - 0.20050222-1 +- gets back Kochi font temporarily. + +* Thu Feb 10 2005 Akira TAGOH - 0.20050210-1 +- Initial release. +- integrated the below packages: + - ttfonts-ja + - jisksp14 + - jisksp16-1990 + - kappa20 + - knm_new + - fonts-ja +- Update shinonome font to 0.9.11. +- Use Sazanami fonts instead of Kochi fonts. diff --git a/k14-1990.patch b/k14-1990.patch new file mode 100644 index 0000000..91a9bef --- /dev/null +++ b/k14-1990.patch @@ -0,0 +1,103 @@ +*** k14.bdf Tue Jun 8 17:40:53 1993 +--- k14-1990.bdf Fri Jul 9 12:07:09 1993 +*************** +*** 2,9 **** + COMMENT + COMMENT Donated by H. Kagotani ; public domain + COMMENT font from Japan + COMMENT +! FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-140-JISX0208.1983-0 + SIZE 14 75 75 + FONTBOUNDINGBOX 14 14 0 -2 + STARTPROPERTIES 19 +--- 2,11 ---- + COMMENT + COMMENT Donated by H. Kagotani ; public domain + COMMENT font from Japan ++ COMMENT Modified by TAKADA Toshihiro ++ COMMENT changed to JIS X 0208-1990 + COMMENT +! FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-140-JISX0208.1990-0 + SIZE 14 75 75 + FONTBOUNDINGBOX 14 14 0 -2 + STARTPROPERTIES 19 +*************** +*** 20,33 **** + RESOLUTION_Y 75 + SPACING "C" + AVERAGE_WIDTH 140 +! CHARSET_REGISTRY "JISX0208.1983" + CHARSET_ENCODING "0" + DEFAULT_CHAR 8481 + FONT_DESCENT 2 + FONT_ASCENT 12 + COPYRIGHT "Public domain font. Share and enjoy." + ENDPROPERTIES +! CHARS 6877 + STARTCHAR 2121 + ENCODING 8481 + SWIDTH 960 0 +--- 22,35 ---- + RESOLUTION_Y 75 + SPACING "C" + AVERAGE_WIDTH 140 +! CHARSET_REGISTRY "JISX0208.1990" + CHARSET_ENCODING "0" + DEFAULT_CHAR 8481 + FONT_DESCENT 2 + FONT_ASCENT 12 + COPYRIGHT "Public domain font. Share and enjoy." + ENDPROPERTIES +! CHARS 6879 + STARTCHAR 2121 + ENCODING 8481 + SWIDTH 960 0 +*************** +*** 144445,144448 **** +--- 144447,144492 ---- + 03F8 + 0208 + ENDCHAR ++ STARTCHAR 7425 ++ ENCODING 29733 ++ SWIDTH 960 0 ++ DWIDTH 14 0 ++ BBX 14 14 0 -2 ++ BITMAP ++ 0040 ++ 07FC ++ 2000 ++ 13F8 ++ 12E8 ++ 02A8 ++ 02E8 ++ 13F8 ++ 11F0 ++ 2040 ++ 27FC ++ 4150 ++ 4248 ++ 0448 ++ ENDCHAR ++ STARTCHAR 7426 ++ ENCODING 29734 ++ SWIDTH 960 0 ++ DWIDTH 14 0 ++ BBX 14 14 0 -2 ++ BITMAP ++ 0000 ++ 3F78 ++ 2248 ++ 2F48 ++ 2978 ++ 2948 ++ 2F40 ++ 2244 ++ 3F44 ++ 203C ++ 0000 ++ 2488 ++ 2244 ++ 4244 ++ ENDCHAR + ENDFONT diff --git a/k14.patch b/k14.patch new file mode 100644 index 0000000..c468e3a --- /dev/null +++ b/k14.patch @@ -0,0 +1,66 @@ +--- k14.bdf.orig Thu Nov 30 07:38:41 1989 ++++ k14.bdf Thu Sep 21 16:24:18 2000 +@@ -34454,19 +34454,19 @@ + BBX 14 14 0 -2 + BITMAP + 0000 +-3DF0 +-2510 +-25F0 +-3D10 +-25F0 +-3C00 +-27FC +-2500 +-3DF8 +-1AA8 +-14A8 +-2548 +-42B0 ++3CF8 ++2488 ++24F8 ++3C88 ++24F8 ++3C40 ++24FC ++2554 ++3E54 ++1894 ++1524 ++2444 ++4218 + ENDCHAR + STARTCHAR 3b73 + ENCODING 15219 +@@ -38821,7 +38821,7 @@ + DWIDTH 14 0 + BBX 14 14 0 -2 + BITMAP +-1210 ++1110 + 0920 + 3FFC + 27C8 +@@ -39157,7 +39157,7 @@ + DWIDTH 14 0 + BBX 14 14 0 -2 + BITMAP +-1210 ++1110 + 0920 + 3FFC + 2008 +@@ -65767,10 +65767,10 @@ + 0820 + 0820 + 0820 +-09FC ++09F8 + 7E20 + 1220 +-13F8 ++13FC + 1270 + 3C70 + 24A8 diff --git a/mplus_bitmap_fonts-install.patch b/mplus_bitmap_fonts-install.patch new file mode 100644 index 0000000..8f8241e --- /dev/null +++ b/mplus_bitmap_fonts-install.patch @@ -0,0 +1,43 @@ +diff -ruN mplus_bitmap_fonts-2.2.1.orig/install_mplus_fonts mplus_bitmap_fonts-2.2.1/install_mplus_fonts +--- mplus_bitmap_fonts-2.2.1.orig/install_mplus_fonts 2004-06-12 20:36:49.000000000 +0900 ++++ mplus_bitmap_fonts-2.2.1/install_mplus_fonts 2004-06-17 22:01:12.000000000 +0900 +@@ -52,7 +52,8 @@ + do + b=`basename $f .bdf` + echo "create: $b.pcf.gz" +- bdftopcf $f | gzip > $PREFIX/$b.pcf.gz ++ cp -a $f $PREFIX/ ++# bdftopcf $f | gzip > $PREFIX/$b.pcf.gz + done + echo "create: fonts.alias for M+ BITMAP FONTS E" + cat fonts.alias > $PREFIX/fonts.alias +@@ -69,14 +70,16 @@ + cp ../$b.bdf ./ + patch $b.bdf $b.diff + mv $b.bdf $b-euro.bdf +- bdftopcf $b-euro.bdf | gzip > $PREFIX/$b-euro.pcf.gz ++ cp -a $b-euro.bdf $PREFIX/ ++# bdftopcf $b-euro.bdf | gzip > $PREFIX/$b-euro.pcf.gz + done + + echo "create: mplus_h12rw-euro.pcf.gz" + awk '/^SWIDTH/{$2 += 80} /^DWIDTH/{$2 += 1} {print}' \ + mplus_h12r-euro.bdf | sed 's/hlv/hlvw/' > mplus_h12rw-euro.bdf +- bdftopcf mplus_h12rw-euro.bdf \ +- | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz ++ cp -a mplus_h12rw-euro.bdf $PREFIX/ ++# bdftopcf mplus_h12rw-euro.bdf \ ++# | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz + + # rm $b-euro.bdf + echo "create: fonts.alias for M+ BITMAP FONTS EURO" +@@ -141,7 +144,8 @@ + do + b=`basename $f .bdf` + echo "create: $b.pcf.gz" +- bdftopcf $f | gzip > $PREFIX/$b.pcf.gz ++ cp -a $f $PREFIX/ ++# bdftopcf $f | gzip > $PREFIX/$b.pcf.gz + done + + # rm mplus_j1*b.bdf diff --git a/sources b/sources index e69de29..f0f86a1 100644 --- a/sources +++ b/sources @@ -0,0 +1,14 @@ +19ff56e6de82e8f9a02c9cebf5af0cdc Kappa20-0.396.tar.bz2 +38ce9221d128383a3f9f50eb641da424 shinonome-0.9.11-src.tar.bz2 +b3900ebac6dd1044423bef5e23d653dc imamura-jisx0213.tgz +8bf9dd5217c81c8ab158cb422fae3270 jiskan24-2000-1.bdf.gz +497d6296632f5e29475bbf7074912f6b jiskan24-2000-2.bdf.gz +d452c1138a4684f864b8d12ec0e2f00d jiskan24-2003-1.bdf.gz +e8a452c07cd5d1d31d3a6f32c2b74265 jisksp14.bdf.gz +c59fc33f4319a291c1f3f7d58d896b9c k14-oldkanji.tar.gz +e0a103ceeffe0aa1c5670458f47452b3 kaname_k12_bdf.tar.gz +a412bc6920d29be2689b3c3192bcdbd2 marumoji.tgz +a97a99acbee54976407dec828d03850c mplus_bitmap_fonts-2.2.4.tar.gz +c6b7771e4f00e310fe807b3245fd316e vine-fonttools-0.1.tgz +e0e1d3b139159a2af09bc9867c9a654b warabi12-0.19a.tar.gz +fa5981d270f432d36818329c8878ba6e xfonts_jp.tgz