rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.1,1.2

[Caius Chance]

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23502

Modified Files:
	cjkuni-fonts.spec 
Log Message:
* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-17.fc11
- Resolves: rhbz#477373
- Refined package dependencies and compat font symlinks.



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cjkuni-fonts.spec	21 Jan 2009 03:37:41 -0000	1.1
+++ cjkuni-fonts.spec	22 Jan 2009 02:16:39 -0000	1.2
@@ -7,12 +7,12 @@
 %define gsdir           %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
-%define umingbuilddir   %{name}-uming-%{version}
-%define ukaibuilddir    %{name}-ukai-%{version}
+%define umingbuilddir   %{fontname}-uming-fonts-%{version}
+%define ukaibuilddir    %{fontname}-ukai-fonts-%{version}
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     16%{?dist}
+Release:     17%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -39,10 +39,7 @@
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
 Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-uming < 0.2.20080216.1-16
+Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
 %common_desc
@@ -67,10 +64,7 @@
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
 Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-ukai < 0.2.20080216.1-16
+Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
 %common_desc
@@ -98,7 +92,7 @@
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-common < 0.2.20080216.1-16 
+Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
 
 %description -n %{fontname}-fonts-common
 %common_desc
@@ -121,10 +115,7 @@
 Summary:      Chinese Unicode TrueType font compatibility files.
 Group:        User Interface/X
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-compat < 0.2.20080216.1-16 
+Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
 
 %description -n %{fontname}-fonts-compat
 %common_desc
@@ -192,15 +183,24 @@
 # backward compat to obsoleted ttf
 %__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
 %__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%__ln_s ../../%{name}/uming.ttc \
+%__ln_s %{_fontdir}/uming.ttc \
     %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%__ln_s ../../%{name}/uming.ttc \
+%__ln_s %{_fontdir}/uming.ttc \
     %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-17.fc11
+- Resolves: rhbz#477373
+- Refined package dependencies and compat font symlinks.
+
+* Wed Jan 21 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-16.fc11
+- Resolves: rhbz#253813
+- Renamed from cjkunifonts to cjkuni-fonts according to new font packaging
+  guidelines.
+
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-15.fc11
 - Resolves: rhbz#477373
 - Updated font renaming for post-1.13 fontpackages.