rpms/fonts-chinese/devel fonts-chinese.spec,1.27,1.28

[fedora-cvs-commits at redhat.com]

Author: cchance

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

Modified Files:
	fonts-chinese.spec 
Log Message:
* Wed Jan 31 2007 Caius Chance <cchance at redhat.com> - 3.03-2.fc7
- Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide)



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fonts-chinese.spec	9 Nov 2006 00:35:51 -0000	1.27
+++ fonts-chinese.spec	31 Jan 2007 03:04:50 -0000	1.28
@@ -11,7 +11,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -61,6 +61,8 @@
 
 install -d $RPM_BUILD_ROOT%{ttfontdir}
 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 -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 644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
@@ -88,6 +90,8 @@
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
+touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +110,11 @@
 	done
 	#Update fontconfig cache
 	[  -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null
+
+        # make symlinks for java referring to old path and fonts
+        ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf || :
+        ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf || :
+
 }
 
 %postun
@@ -128,6 +137,10 @@
 %dir %{cidmapdir}
 %{ttfontdir}
 %{miscfontdir}
+%dir %{_datadir}/fonts/zh_CN
+%dir %{_datadir}/fonts/zh_TW
+%dir %{_datadir}/fonts/zh_CN/TrueType
+%dir %{_datadir}/fonts/zh_TW/TrueType
 %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
@@ -135,12 +148,17 @@
 %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
+%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
 
 %changelog
+* Wed Jan 31 2007 Caius Chance <cchance at redhat.com> - 3.03-2.fc7
+- Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide)
+
 * Thu Nov 09 2006 Caius Chance <cchance at redhat.com> - 3.03-1.fc7
 - Included new release of arphic uming & ukai (20060928).