rpms/cjkunifonts/devel cjkunifonts.spec,1.11,1.12

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
moved all .conf files to conf.avail and symlinked to conf.d



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cjkunifonts.spec	30 Sep 2008 04:57:39 -0000	1.11
+++ cjkunifonts.spec	30 Sep 2008 07:11:28 -0000	1.12
@@ -1,6 +1,7 @@
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define fcdir           %{_sysconfdir}/fonts/conf.d
+%define fcdiravail      %{_sysconfdir}/fonts/conf.avail
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
@@ -9,7 +10,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -86,8 +87,17 @@
 
 # fontconfig config files
 install -d $RPM_BUILD_ROOT%{fcdir}
-install -m 0644 %{umingbuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
-install -m 0644 %{ukaibuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
+install -d $RPM_BUILD_ROOT%{fcdiravail}
+for conf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
+do
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
+    ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+done
+for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
+do
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
+    ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+done
 
 # backward compat
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
@@ -157,7 +167,8 @@
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
 %{umingfontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-uming*.conf
+%{fcdiravail}/*-ttf-arphic-uming*.conf
+%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -184,7 +195,8 @@
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
 %{ukaifontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-ukai*.conf
+%{fcdiravail}/*-ttf-arphic-ukai*.conf
+%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -196,6 +208,10 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-4.fc10
+- Resolves: rhbz#459680 (All .conf files are in fonts.avail and soft linked to
+  fonts.d.)
+
 * Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-3.fc10
 - Resolves: rhbz#459680 (repatched)