rpms/cjkunifonts/devel cjkunifonts.spec, 1.12, 1.13 cjkunifonts-0.2.20080216.1-2.patch, 1.1, NONE

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Removed Files:
	cjkunifonts-0.2.20080216.1-2.patch 
Log Message:
Unsymlinked 25-ttf-arphic-uming-bitmaps.conf



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cjkunifonts.spec	30 Sep 2008 07:11:28 -0000	1.12
+++ cjkunifonts.spec	1 Oct 2008 01:04:36 -0000	1.13
@@ -10,7 +10,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     4%{?dist}
+Release:     5%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -24,7 +24,6 @@
 Source6:    cidfmap.zh_CN
 Source7:    CIDFnmap.zh_TW
 Source8:    CIDFnmap.zh_CN
-Patch0:     cjkunifonts-0.2.20080216.1-2.patch
 
 BuildRequires:    xorg-x11-font-utils, ttmkfdir
 BuildArch:        noarch
@@ -61,7 +60,6 @@
 
 %prep
 %setup -q -c -T -a1 -n %{name}-uming-%{version}
-%patch0 -p1 -b .1-rhbz459680
 %setup -q -c -T -a2 -n %{name}-ukai-%{version}
 
 %build
@@ -91,7 +89,10 @@
 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}/
+    if [ $conf != %{umingbuilddir}/25-ttf-arphic-uming-bitmaps.conf ]
+    then
+        ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+    fi
 done
 for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
@@ -208,7 +209,10 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-4.fc10
+* 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.)
+
+* Tue 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.)
 


--- cjkunifonts-0.2.20080216.1-2.patch DELETED ---