Attachment 148997 Details for Bug 225765 – Some Changes to SPEC file

[patch] Some Changes to SPEC file

ja.patch (text/plain), 9.49 KB, created by Parag AN(पराग) on 2007-03-01 07:02:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Parag AN(पराग)

Created: 2007-03-01 07:02:56 UTC

Size: 9.49 KB

patch

obsolete

>--- fonts-japanese.spec	2006-11-24 18:27:38.000000000 +0530
>+++ fonts-japanese-modified.spec	2007-03-01 12:05:29.000000000 +0530
>@@ -1,94 +1,94 @@
>-%define language	japanese
>-%define basefontdir	%{_datadir}/fonts/%{language}
>-%define ttfontdir	%{basefontdir}/TrueType
>-%define bmpfontdir	%{basefontdir}/misc
>-%define cidmapdir	%{_sysconfdir}/ghostscript
>-%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 language  japanese
>+%define basefontdir  %{_datadir}/fonts/%{language}
>+%define ttfontdir  %{basefontdir}/TrueType
>+%define bmpfontdir  %{basefontdir}/misc
>+%define cidmapdir  %{_sysconfdir}/ghostscript
>+%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 sazanami	sazanami-20061016
>+%define sazanami  sazanami-20061016
> ## 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
>-%define	warabi12	warabi12-0.19a
>-%define	mplus		mplus_bitmap_fonts-2.2.2
>-%define	vft		vine-fonttools-0.1
>-
>-Name:		fonts-japanese
>-Version:	0.20061016
>-Release:	2%{?dist}
>-License:	Distributable
>-Group:		User Interface/X
>-BuildArch:	noarch
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
>-BuildRequires:	gzip xorg-x11-font-utils
>+%define kappa    Kappa20-0.396
>+%define shinonome  shinonome-0.9.11
>+%define  warabi12  warabi12-0.19a
>+%define  mplus    mplus_bitmap_fonts-2.2.2
>+%define  vft    vine-fonttools-0.1
>+
>+Name:    fonts-japanese
>+Version:  0.20061016
>+Release:  2%{?dist}
>+License:  Distributable
>+Group:    User Interface/X
>+BuildArch:  noarch
>+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+BuildRequires:  gzip xorg-x11-font-utils
> 
> ## files in ttfonts-ja
>-Source0:	http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
>-Source1:	fonts.alias.sz
>-Source2:	FAPIcidfmap.ja
>-Source3:	cidfmap.ja
>-Source4:	CIDFnmap.ja
>+Source0:  http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2
>+Source1:  fonts.alias.sz
>+Source2:  FAPIcidfmap.ja
>+Source3:  cidfmap.ja
>+Source4:  CIDFnmap.ja
> ## FIXME: the below lines will be removed in the future.
> ## Source0:     http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2
>-#Source5:	%{ksnonaga10}.tar.bz2
>-#Source6:	fonts.alias.kk
>+#Source5:  %{ksnonaga10}.tar.bz2
>+#Source6:  fonts.alias.kk
> ## files in jisksp14
>-Source10:	jisksp14.bdf.gz
>+Source10:  jisksp14.bdf.gz
> ## files in jisksp16-1990
>-Source20:	jisksp16-1990.bdf.gz
>+Source20:  jisksp16-1990.bdf.gz
> ## files in kappa20
> ## files in knm_new
>-Source40:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
>-Source41:	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz
>+Source40:  http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
>+Source41:  ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz
> ## files in fonts-ja
>-Source50:	xfonts_jp.tgz
>-Source51:	http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2
>-Source52:	http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2
>+Source50:  xfonts_jp.tgz
>+Source51:  http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2
>+Source52:  http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2
> ## http://mlnews.com/marumoji/
>-Source53:	marumoji.tgz
>+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
>-Source54:	imamura-jisx0213.tgz
>+Source54:  imamura-jisx0213.tgz
> # jiskan16 JIS X 0208:1990 by Yasuoka
> # http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/
>-Source55:	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z
>+Source55:  http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z
> # jiskan16 JIS X 0208:1997 Old Kanji
>-Source56:	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z
>+Source56:  http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z
> # k14 Old-Kanji
>-Source57:	http://www.hlla.is.tsukuba.ac.jp/~kourai/software/k14-oldkanji.tar.gz
>+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/
>-Source58:	http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz
>+Source58:  http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz
> # mplus fonts
> # http://mplus-fonts.sourceforge.jp/
>-Source59:	http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz
>-Source60:	%{vft}.tgz
>+Source59:  http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz
>+Source60:  %{vft}.tgz
> 
>-Patch50:	http://kappa.allnet.ne.jp/kanou/fonts/k14.patch
>+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
>+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/TrueType fonts
>+Summary:  Free Japanese Bitmap/TrueType fonts
> 
> Requires(post): ttmkfdir >= 3.0.6, mkfontdir, fontconfig, /usr/sbin/chkfontpath
> Requires(postun): fontconfig, /usr/sbin/chkfontpath
>@@ -199,13 +199,13 @@
>   12x24a/          12x24rk/         jiskan24/
> "
> 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
>+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
> 
>@@ -254,14 +254,14 @@
> 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  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  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 - \
>@@ -349,9 +349,9 @@
> {
>     umask 133
>     touch %{ttfontdir} 2> /dev/null && {
>-	/usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
>-	mkfontdir %{ttfontdir}
>-	/usr/sbin/chkfontpath -q -a %{ttfontdir}
>+  /usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
>+  mkfontdir %{ttfontdir}
>+  /usr/sbin/chkfontpath -q -a %{ttfontdir}
>     }
>     mkfontdir %{bmpfontdir} && /usr/sbin/chkfontpath -q -a %{bmpfontdir}
>     fc-cache 2> /dev/null
>@@ -360,8 +360,8 @@
> %postun
> {
>     if [ "$1" = "0" ]; then
>-	/usr/sbin/chkfontpath -q -r %{ttfontdir}
>-	/usr/sbin/chkfontpath -q -r %{bmpfontdir}
>+  /usr/sbin/chkfontpath -q -r %{ttfontdir}
>+  /usr/sbin/chkfontpath -q -r %{bmpfontdir}
>     fi
>     fc-cache 2> /dev/null
> }
>@@ -386,10 +386,10 @@
> %ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
> %ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
> %{ttfontdir}/*ttf
>-%{bmpfontdir}
>-%{cidmapdir}/FAPIcidfmap.ja
>-%{cidmapdir}/cidfmap.ja
>-%{cidmapdir}/CIDFnmap.ja
>+%{bmpfontdir}/*.gz
>+%config(noreplace) %{cidmapdir}/FAPIcidfmap.ja
>+%config(noreplace) %{cidmapdir}/cidfmap.ja
>+%config(noreplace) %{cidmapdir}/CIDFnmap.ja
> 
> %changelog
> * Fri Nov 24 2006 Akira TAGOH <tagoh@redhat.com> - 0.20061016-2

Actions: View | Diff

Attachments on bug 225765: 148997