rpms/cjkunifonts/devel cjkunifonts.spec,1.17,1.18

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
* Mon Oct 13 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-9.fc10
- Resolves: rhbz#466667 (Reverted to 0.2.20080216.1-4 without conf.avail.)




Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cjkunifonts.spec	13 Oct 2008 05:36:43 -0000	1.17
+++ cjkunifonts.spec	29 Oct 2008 01:09:07 -0000	1.18
@@ -1,7 +1,6 @@
 %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
 
@@ -10,7 +9,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     8%{?dist}
+Release:     9%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -87,23 +86,13 @@
 
 # fontconfig config files
 install -d $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}/
-    if [ $conf != %{umingbuilddir}/25-ttf-arphic-uming-bitmaps.conf ]
-    then
-        cd $RPM_BUILD_ROOT%{fcdiravail}/
-        %{__ln_s} ../conf.avail/`basename $conf` $RPM_BUILD_ROOT%{fcdir}/
-        cd -
-    fi
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
 done
 for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
-    cd $RPM_BUILD_ROOT%{fcdiravail}/
-    %{__ln_s} ../conf.avail/`basename $conf` $RPM_BUILD_ROOT%{fcdir}/
-    cd -
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
 done
 
 # backward compat
@@ -174,8 +163,7 @@
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
 %{umingfontdir}/*.ttc
-%{fcdiravail}/*-ttf-arphic-uming*.conf
-%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-uming*.conf
+%{fcdir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -202,8 +190,7 @@
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
 %{ukaifontdir}/*.ttc
-%{fcdiravail}/*-ttf-arphic-ukai*.conf
-%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-ukai*.conf
+%{fcdir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -215,7 +202,7 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Mon Oct 13 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-8.fc10
+* Mon Oct 13 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-9.fc10
 - Resolves: rhbz#466667 (Reverted to 0.2.20080216.1-4 without conf.avail.)
 
 * Tue Oct 07 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-6.fc10