rpms/cjkunifonts/devel cjkunifonts.spec,1.23,1.24

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
revised from %{fcdir} to %{_fontconfig_templatedir}



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cjkunifonts.spec	6 Jan 2009 01:21:29 -0000	1.23
+++ cjkunifonts.spec	6 Jan 2009 01:29:42 -0000	1.24
@@ -9,7 +9,6 @@
 
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
-%define fcdir           %{_sysconfdir}/fonts/conf.d
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
@@ -83,9 +82,9 @@
 rm -rf %{buildroot}
 
 # dirs
-install -d %{buildroot}%{catalogue}
-install -d %{buildroot}%{umingfontdir}
-install -d %{buildroot}%{ukaifontdir}
+install -m 0755 -d %{buildroot}%{catalogue}
+install -m 0755 -d %{buildroot}%{umingfontdir}
+install -m 0755 -d %{buildroot}%{ukaifontdir}
 
 # ttfs
 install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
@@ -98,16 +97,17 @@
 mkfontdir %{buildroot}%{ukaifontdir}
 
 # fontconfig config files
-install -d %{buildroot}%{fcdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+    %{buildroot}%{_fontconfig_confdir}
 for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -176,7 +176,7 @@
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
 %{umingfontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-uming*.conf
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -203,7 +203,7 @@
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
 %{ukaifontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-ukai*.conf
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW