rpms/cjkunifonts/devel cjkunifonts.spec,1.13,1.14

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
* Tue Oct 07 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-6.fc10
- Resolves: rhbz#465900 (Symlinks of fontconfig .conf files are inaccurated.)
- Macro'ed all 'ln -s'.




Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cjkunifonts.spec	1 Oct 2008 01:04:36 -0000	1.13
+++ cjkunifonts.spec	7 Oct 2008 03:31:44 -0000	1.14
@@ -10,7 +10,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     5%{?dist}
+Release:     6%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -91,24 +91,28 @@
     install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
     if [ $conf != %{umingbuilddir}/25-ttf-arphic-uming-bitmaps.conf ]
     then
-        ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+        cd $RPM_BUILD_ROOT%{fcdiravail}/
+        %{__ln_s} ../conf.avail/`basename $conf` $RPM_BUILD_ROOT%{fcdir}/
+        cd -
     fi
 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}/
+    cd $RPM_BUILD_ROOT%{fcdiravail}/
+    %{__ln_s} ../conf.avail/`basename $conf` $RPM_BUILD_ROOT%{fcdir}/
+    cd -
 done
 
 # backward compat
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-ln -s ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-ln -s ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 # catalogue
-ln -s %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
-ln -s %{ukaifontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-ukai
+%{__ln_s} %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
+%{__ln_s} %{ukaifontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-ukai
 
 # ghostscript
 install -d $RPM_BUILD_ROOT%{cidmapdir}
@@ -209,6 +213,10 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Tue Oct 07 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-6.fc10
+- Resolves: rhbz#465900 (Symlinks of fontconfig .conf files are inaccurated.)
+- Macro'ed all 'ln -s'.
+
 * Wed Oct 01 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-5.fc10
 - Resolves: rhbz#459680 (Unsymlinked 25-ttf-arphic-uming-bitmaps.conf.)