rpms/cjkunifonts/devel cjkunifonts.spec,1.28,1.29

[Caius Chance]

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21724

Modified Files:
	cjkunifonts.spec 
Log Message:
repatched rev 11



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cjkunifonts.spec	6 Jan 2009 02:24:34 -0000	1.28
+++ cjkunifonts.spec	8 Jan 2009 07:00:44 -0000	1.29
@@ -5,6 +5,8 @@
 Chinese Unicode TrueType fonts derived from the original fonts generously made \available by Arphic Technology under the "Arphic Public License" and extended \
 by the CJK Unifonts project.
 
+%define umingbuilddir   ../%{name}-uming-%{version}
+%define ukaibuilddir    ../%{name}-ukai-%{version}
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
@@ -12,7 +14,7 @@
 
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     11.2%{?dist}
+Release:     12%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -95,23 +97,23 @@
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
     %{buildroot}%{_fontconfig_confdir}
 
-cd %{name}-uming-%{version}
+cd %{umingbuilddir}
 for fconf in `ls *-ttf-arphic-uming*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
+    cd %{buildroot}%{_fontconfig_confdir}/ && \
+        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
+        cd -
 done
-cd ..
-
-cd %{name}-ukai-%{version}
+cd %{ukaibuilddir}
 for fconf in `ls *-ttf-arphic-ukai*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
+    cd %{buildroot}%{_fontconfig_confdir}/ && \
+        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
+        cd -
 done
-cd ..
+cd -
 
 # backward compat
 install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
@@ -176,14 +178,15 @@
 %dir %{_datadir}/fonts/zh_TW
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
-%{umingfontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
 %{cidmapdir}/CIDFnmap.zh_TW
 %{cidmapdir}/CIDFnmap.zh_CN
+%{umingfontdir}/*.ttc
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
+%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
 %verify(not md5 size mtime) %{umingfontdir}/fonts.dir
 %verify(not md5 size mtime) %{umingfontdir}/fonts.scale
 %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
@@ -203,20 +206,21 @@
 %doc %{ukaibuilddir}/README
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
-%{ukaifontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
 %{cidmapdir}/CIDFnmap.zh_TW
 %{cidmapdir}/CIDFnmap.zh_CN
+%{ukaifontdir}/*.ttc
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
+%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
 %verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
 %verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.2.fc11
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-12.fc11
 - Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
 
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11