rpms/cjkunifonts/devel cjkunifonts.spec,1.30,1.31
Caius Chance
cchance at fedoraproject.org
Mon Jan 19 01:32:27 UTC 2009
Author: cchance
Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27488
Modified Files:
cjkunifonts.spec
Log Message:
* 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.
- Created common subpackage for common files.
- Created compat subpackage for uming backward compatibility.
- Refined descriptions.
Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cjkunifonts.spec 14 Jan 2009 04:47:38 -0000 1.30
+++ cjkunifonts.spec 19 Jan 2009 01:31:56 -0000 1.31
@@ -1,10 +1,9 @@
%define fontname cjkunifonts
%define common_desc \
-Chinese Unicode TrueType fonts derived from original fonts made available by \
-Arphic Technology under "Arphic Public License" and extended by the CJK \
-Unifonts project.
+CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
+available by Arphic Technology under "Arphic Public License" and extended by \
+the CJK Unifonts project.
-%define fontdir %{_datadir}/fonts/%{name}
%define gsdir %{_datadir}/ghostscript/conf.d
%define catalogue %{_sysconfdir}/X11/fontpath.d
@@ -13,7 +12,7 @@
Name: %{fontname}
Version: 0.2.20080216.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Chinese Unicode TrueType fonts in Ming and Kai face.
License: Arphic
Group: User Interface/X
@@ -40,7 +39,7 @@
Summary: Chinese Unicode TrueType font in Ming face.
License: Arphic
Group: User Interface/X
-Requires: fontpackages-filesystem
+Requires: fontpackages-filesystem, %{name}-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
@@ -48,8 +47,7 @@
%description uming
%common_desc
-Ming face Chinese Unicode TrueType font derived from the original fonts \
-released by Arphic Technology and extended by the CJK Unifonts project.
+CJK Unifonts in Ming face.
%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
@@ -64,23 +62,12 @@
%doc ../%{umingbuilddir}/NEWS
%doc ../%{umingbuilddir}/README
%doc ../%{umingbuilddir}/TODO
-%{gsdir}/FAPIcidfmap.zh_TW
-%{gsdir}/FAPIcidfmap.zh_CN
-%{gsdir}/cidfmap.zh_TW
-%{gsdir}/cidfmap.zh_CN
-%{gsdir}/CIDFnmap.zh_TW
-%{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-%{catalogue}/%{name}
%package ukai
Summary: Chinese Unicode TrueType font in Kai face.
License: Arphic
Group: User Interface/X
-Requires: fontpackages-filesystem
+Requires: fontpackages-filesystem, %{name}-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
@@ -88,8 +75,7 @@
%description ukai
%common_desc
-Kai face Chinese Unicode TrueType font derived from the original fonts \
-released by Arphic Technology and extended by the CJK Unifonts project.
+CJK Unifonts in Kai face.
%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
@@ -104,16 +90,52 @@
%doc ../%{ukaibuilddir}/NEWS
%doc ../%{ukaibuilddir}/README
%doc ../%{ukaibuilddir}/TODO
+
+%package common
+Summary: Chinese Unicode TrueType font common files.
+License: Arphic
+Group: User Interface/X
+Requires: fontpackages-filesystem
+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
+
+%description common
+%common_desc
+
+CJK Unifonts common files.
+
+%files common
+%defattr(0644,root,root,0755)
%{gsdir}/FAPIcidfmap.zh_TW
%{gsdir}/FAPIcidfmap.zh_CN
%{gsdir}/cidfmap.zh_TW
%{gsdir}/cidfmap.zh_CN
%{gsdir}/CIDFnmap.zh_TW
%{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.scale
%{catalogue}/%{name}
+%package compat
+Summary: Chinese Unicode TrueType font compatibility files.
+License: Arphic
+Group: User Interface/X
+Requires: fontpackages-filesystem, %{name}-uming = %{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
+
+%description compat
+%common_desc
+
+CJK Unifonts compatibility files.
+
+%files compat
+%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
+
%prep
%setup -q -c -T -a1 -n %{umingbuilddir}
%patch1 -p1 -b .1-rhbz466667
@@ -126,14 +148,14 @@
%__rm -rf %{buildroot}
# *.ttc(ttf)
-%__install -m 0755 -d %{buildroot}%{fontdir}
-%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{fontdir}/
-%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{fontdir}/
+%__install -m 0755 -d %{buildroot}%{_fontdir}
+%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{_fontdir}/
+%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{_fontdir}/
# fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
- -o %{buildroot}%{fontdir}/fonts.scale
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
+ -o %{buildroot}%{_fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{_fontdir}
# *.conf
%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
@@ -154,14 +176,6 @@
done
cd -
-# 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 \
- %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%__ln_s ../../%{name}/uming.ttc \
- %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-
# ghostscript
%__install -m 0755 -d %{buildroot}%{gsdir}
%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
@@ -173,12 +187,27 @@
# catalogue
%__install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{name}
+%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+
+# 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 \
+ %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%__ln_s ../../%{name}/uming.ttc \
+ %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
%clean
%__rm -fr ${buildroot}
%changelog
+* 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.
+- Created common subpackage for common files.
+- Created compat subpackage for uming backward compatibility.
+- Refined descriptions.
+
* Wed Jan 14 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-13.fc11
- Resolves: rhbz#477373
- Included _font_pkg macro to conform new font packaging guidelines.
More information about the Fedora-fonts-bugs-list
mailing list