rpms/fonts-chinese/devel fonts-chinese.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: llch

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

Modified Files:
	fonts-chinese.spec 
Log Message:
migrate taipeifonts to fonts-chinese and fix its directory structures



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fonts-chinese.spec	14 Nov 2005 18:52:39 -0000	1.15
+++ fonts-chinese.spec	15 Nov 2005 03:57:15 -0000	1.16
@@ -1,16 +1,18 @@
 %define	basefontdir	%{_datadir}/fonts/chinese
 %define	ttfontdir	%{basefontdir}/TrueType
+%define	miscfontdir	%{basefontdir}/misc
 %define cidmapdir   %{_sysconfdir}/ghostscript
 %define ___mkfontdir	%(echo `which mkfontdir`)
 %define __mkfontdir	umask 133; %___mkfontdir
 
 %define beta 0.dot.3
 %define ver 0.1
+%define taipeiver 1.2
 
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
-Version:    3.01
-Release:    3
+Version:    3.02
+Release:    1
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -18,6 +20,8 @@
 
 Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
 Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
+Source2:    taipeifonts-%{taipeiver}.tar.gz
+Source9:    taipeifonts.alias
 Source10:	arphicpl.txt
 Source11:	arphicpl-big5.txt
 Source12:	arphicpl-gb.txt
@@ -31,27 +35,38 @@
 Requires(post,postun): mkfontdir 
 Requires(post,postun): fontconfig
 Requires(post,postun): /usr/sbin/chkfontpath
-Obsoletes:	ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai
+Obsoletes:	ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai taipeifonts
 
 %description
 Chinese TTF Fonts donated by Arphic company, with additional Hong Kong characters by Hong Kong font project and bitmap by F
 irefly. Read license files for details.
 
 %prep
+tar xzvf %{SOURCE0} 
+tar xzvf %{SOURCE1}
+tar xzvf %{SOURCE2}
 
 %build
 mkdir -p %{name}-%{version}/doc
+pushd taipeifonts-%{taipeiver}/
+bdftopcf taipei24.bdf | gzip -c > taipei24.pcf.gz
+bdftopcf taipei20.bdf | gzip -c > taipei20.pcf.gz
+bdftopcf taipei16.bdf | gzip -c > taipei16.pcf.gz
+popd
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{ttfontdir}
-tar xzvf %{SOURCE0} 
-tar xzvf %{SOURCE1}
+install -d $RPM_BUILD_ROOT%{miscfontdir}
 install -m 0644 ttf-arphic-ukai-%{ver}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 ttf-arphic-uming-%{ver}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-#install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{ttfontdir}/
-#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/
+install -m 644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
+
 
 # for ghostscript
 install -d $RPM_BUILD_ROOT%{cidmapdir}/
@@ -68,6 +83,9 @@
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.dir
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.scale
+touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
+touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir
+touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -81,6 +99,11 @@
 		/usr/sbin/chkfontpath -q -a %{ttfontdir}
 	}
 
+	touch %{miscfontdir} 2> /dev/null && {
+		/usr/bin/ttmkfdir -d %{miscfontdir} -o %{miscfontdir}/fonts.scale
+	    %__mkfontdir %{miscfontdir}
+		/usr/sbin/chkfontpath -q -a %{miscfontdir}
+	}
 	#Update fontconfig cache
 	[  -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null
 }
@@ -90,6 +113,7 @@
 then
     umask 133
     /usr/sbin/chkfontpath -q -r %{ttfontdir}
+    /usr/sbin/chkfontpath -q -r %{miscfontdir}
 
     #Update fontconfig cache
     [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null
@@ -100,18 +124,26 @@
 %doc $RPM_BUILD_DIR/%{name}-%{version}/doc/
 %dir %{basefontdir}
 %dir %{ttfontdir}
+%dir %{miscfontdir}
 %dir %{cidmapdir}
 %{ttfontdir}
+%{miscfontdir}
 %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) %{ttfontdir}/fonts.dir
 %ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.scale
+%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.dir
+%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.scale
+%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Tue Nov 15 2005 Leon Ho <llch at redhat.com> - 3.02-1
+- migrate taipeifonts to this package
+
 * Mon Nov 14 2005 Warren Togami <wtogami at redhat.com> - 3.01-3
 - rebuild against modular X