rpms/cjkunifonts/devel cjkunifonts.spec,1.31,1.32
Caius Chance
cchance at fedoraproject.org
Mon Jan 19 02:30:22 UTC 2009
Author: cchance
Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2599
Modified Files:
cjkunifonts.spec
Log Message:
* 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.
Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cjkunifonts.spec 19 Jan 2009 01:31:56 -0000 1.31
+++ cjkunifonts.spec 19 Jan 2009 02:29:52 -0000 1.32
@@ -1,4 +1,4 @@
-%define fontname cjkunifonts
+%define fontname cjkuni
%define common_desc \
CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
available by Arphic Technology under "Arphic Public License" and extended by \
@@ -10,9 +10,9 @@
%define umingbuilddir %{name}-uming-%{version}
%define ukaibuilddir %{name}-ukai-%{version}
-Name: %{fontname}
+Name: %{fontname}-fonts
Version: 0.2.20080216.1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Chinese Unicode TrueType fonts in Ming and Kai face.
License: Arphic
Group: User Interface/X
@@ -35,16 +35,18 @@
%description
%common_desc
-%package uming
+%package -n %{fontname}-uming-fonts
Summary: Chinese Unicode TrueType font in Ming face.
License: Arphic
Group: User Interface/X
-Requires: fontpackages-filesystem, %{name}-common = %{version}-%{release}
+Requires: fontpackages-filesystem
+Requires: %{fontname}-common-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}-uming < %{version}-%{release}
-%description uming
+%description -n %{fontname}-uming-fonts
%common_desc
CJK Unifonts in Ming face.
@@ -63,16 +65,18 @@
%doc ../%{umingbuilddir}/README
%doc ../%{umingbuilddir}/TODO
-%package ukai
+%package -n %{fontname}-ukai-fonts
Summary: Chinese Unicode TrueType font in Kai face.
License: Arphic
Group: User Interface/X
-Requires: fontpackages-filesystem, %{name}-common = %{version}-%{release}
+Requires: fontpackages-filesystem
+Requires: %{fontname}-common-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}-ukai < %{version}-%{release}
-%description ukai
+%description -n %{fontname}-ukai-fonts
%common_desc
CJK Unifonts in Kai face.
@@ -91,7 +95,7 @@
%doc ../%{ukaibuilddir}/README
%doc ../%{ukaibuilddir}/TODO
-%package common
+%package -n %{fontname}-common-fonts
Summary: Chinese Unicode TrueType font common files.
License: Arphic
Group: User Interface/X
@@ -99,13 +103,14 @@
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 < %{version}-%{release}
-%description common
+%description -n %{fontname}-common-fonts
%common_desc
CJK Unifonts common files.
-%files common
+%files -n %{fontname}-common-fonts
%defattr(0644,root,root,0755)
%{gsdir}/FAPIcidfmap.zh_TW
%{gsdir}/FAPIcidfmap.zh_CN
@@ -117,21 +122,23 @@
%verify(not md5 size mtime) %{_fontdir}/fonts.scale
%{catalogue}/%{name}
-%package compat
+%package -n %{fontname}-compat-fonts
Summary: Chinese Unicode TrueType font compatibility files.
License: Arphic
Group: User Interface/X
-Requires: fontpackages-filesystem, %{name}-uming = %{version}-%{relsease}
+Requires: fontpackages-filesystem
+Requires: %{fontname}-uming-fonts = %{version}-%{relsease}
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 < %{version}-%{release}
-%description compat
+%description -n %{fontname}-compat-fonts
%common_desc
CJK Unifonts compatibility files.
-%files compat
+%files -n %{fontname}-compat-fonts
%defattr(0644,root,root,0755)
%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
@@ -201,6 +208,10 @@
%__rm -fr ${buildroot}
%changelog
+* 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.
+
* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-14.fc11
- Resolves: rhbz#477373
- Used _fontdir macro instead of self-definition.
More information about the Fedora-fonts-bugs-list
mailing list