rpms/fonts-chinese/devel fonts-chinese.spec,1.40,1.41

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28208

Modified Files:
	fonts-chinese.spec 
Log Message:
Fixed fontpath.d shortcut problem.




Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- fonts-chinese.spec	16 Aug 2007 06:14:50 -0000	1.40
+++ fonts-chinese.spec	17 Aug 2007 00:48:57 -0000	1.41
@@ -61,7 +61,6 @@
 install -d $RPM_BUILD_ROOT%{miscfontdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-install -d $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
 install -m 0644 ttf-arphic-ukai-%{ver}.%{minor}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 ttf-arphic-uming-%{ver}.%{minor}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
@@ -82,7 +81,11 @@
 # for docu
 cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} $RPM_BUILD_DIR/%{name}-%{version}/doc/
 
-# for dummy
+# for catalogue
+install -d $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
+
+# for fonts.*
 touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.dir
@@ -90,11 +93,11 @@
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
+
+# for backward compatibility
 touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
 touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
-# Install catalogue symlink
-ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,9 +147,16 @@
 %dir %{_datadir}/fonts/zh_TW
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
+%dir %{catalogue}
 %{ttfontdir}/*.ttf
 %{miscfontdir}/*.gz
 %{miscfontdir}/fonts.alias
+%{cidmapdir}/FAPIcidfmap.zh_TW
+%{cidmapdir}/FAPIcidfmap.zh_CN
+%{cidmapdir}/cidfmap.zh_TW
+%{cidmapdir}/cidfmap.zh_CN
+%{cidmapdir}/CIDFnmap.zh_TW
+%{cidmapdir}/CIDFnmap.zh_CN
 %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
@@ -156,12 +166,6 @@
 %ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
 %ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
 %ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
 %{catalogue}/fonts-chinese