rpms/cjkunifonts/devel cjkunifonts.spec,1.29,1.30
Caius Chance
cchance at fedoraproject.org
Wed Jan 14 04:48:08 UTC 2009
Author: cchance
Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6413
Modified Files:
cjkunifonts.spec
Log Message:
* 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.
- Tidy up .spec file.
Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cjkunifonts.spec 8 Jan 2009 07:00:44 -0000 1.29
+++ cjkunifonts.spec 14 Jan 2009 04:47:38 -0000 1.30
@@ -1,21 +1,20 @@
%define fontname cjkunifonts
-%define fontconf <65>-%{fontname}
-%define archivename %{name}-%{version}
%define common_desc \
-Chinese Unicode TrueType fonts derived from the original fonts generously made \available by Arphic Technology under the "Arphic Public License" and extended \
-by the CJK Unifonts project.
+Chinese Unicode TrueType fonts derived from original fonts made available by \
+Arphic Technology under "Arphic Public License" and extended by the CJK \
+Unifonts project.
-%define umingbuilddir ../%{name}-uming-%{version}
-%define ukaibuilddir ../%{name}-ukai-%{version}
-%define umingfontdir %{_datadir}/fonts/%{name}-uming
-%define ukaifontdir %{_datadir}/fonts/%{name}-ukai
-%define cidmapdir %{_datadir}/ghostscript/conf.d
+%define fontdir %{_datadir}/fonts/%{name}
+%define gsdir %{_datadir}/ghostscript/conf.d
%define catalogue %{_sysconfdir}/X11/fontpath.d
+%define umingbuilddir %{name}-uming-%{version}
+%define ukaibuilddir %{name}-ukai-%{version}
+
Name: %{fontname}
Version: 0.2.20080216.1
-Release: 12%{?dist}
-Summary: Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
+Release: 13%{?dist}
+Summary: Chinese Unicode TrueType fonts in Ming and Kai face.
License: Arphic
Group: User Interface/X
URL: http://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -38,7 +37,7 @@
%common_desc
%package uming
-Summary: Chinese Uming style face TrueType Font
+Summary: Chinese Unicode TrueType font in Ming face.
License: Arphic
Group: User Interface/X
Requires: fontpackages-filesystem
@@ -49,11 +48,36 @@
%description uming
%common_desc
-Chinese Uming style face TrueType Font derived from the original fonts released
-by Arphic Technology and extended by the CJK Unifonts project.
+Ming face Chinese Unicode TrueType font derived from the original fonts \
+released by Arphic Technology and extended by the CJK Unifonts project.
+
+%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
+
+# remaining uming files
+%doc ../%{umingbuilddir}/license
+%doc ../%{umingbuilddir}/CONTRIBUTERS
+%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
+%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
+%doc ../%{umingbuilddir}/FONTLOG
+%doc ../%{umingbuilddir}/INSTALL
+%doc ../%{umingbuilddir}/KNOWN_ISSUES
+%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 Ukai style face TrueType font
+Summary: Chinese Unicode TrueType font in Kai face.
License: Arphic
Group: User Interface/X
Requires: fontpackages-filesystem
@@ -64,162 +88,102 @@
%description ukai
%common_desc
-Chinese Ukai style face TrueType Font derived from the original fonts released
-by Arphic Technology and extended by the CJK Unifonts project.
+Kai face Chinese Unicode TrueType font derived from the original fonts \
+released by Arphic Technology and extended by the CJK Unifonts project.
+
+%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
+
+# remaining ukai files
+%doc ../%{ukaibuilddir}/license
+%doc ../%{ukaibuilddir}/CONTRIBUTERS
+%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
+%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
+%doc ../%{ukaibuilddir}/FONTLOG
+%doc ../%{ukaibuilddir}/INSTALL
+%doc ../%{ukaibuilddir}/KNOWN_ISSUES
+%doc ../%{ukaibuilddir}/NEWS
+%doc ../%{ukaibuilddir}/README
+%doc ../%{ukaibuilddir}/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
+%{catalogue}/%{name}
%prep
-%setup -q -c -T -a1 -n %{name}-uming-%{version}
+%setup -q -c -T -a1 -n %{umingbuilddir}
%patch1 -p1 -b .1-rhbz466667
-%setup -q -c -T -a2 -n %{name}-ukai-%{version}
+%setup -q -c -T -a2 -n %{ukaibuilddir}
%build
%{nil}
%install
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
-# dirs
-install -m 0755 -d %{buildroot}%{catalogue}
-install -m 0755 -d %{buildroot}%{umingfontdir}
-install -m 0755 -d %{buildroot}%{ukaifontdir}
-
-# ttfs
-install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
-install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaifontdir}/
+# *.ttc(ttf)
+%__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}%{umingfontdir} -o %{buildroot}%{umingfontdir}/fonts.scale
-mkfontdir %{buildroot}%{umingfontdir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{ukaifontdir} -o %{buildroot}%{ukaifontdir}/fonts.scale
-mkfontdir %{buildroot}%{ukaifontdir}
-
-# fontconfig config files
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
-
-cd %{umingbuilddir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
+ -o %{buildroot}%{fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+
+# *.conf
+%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
+%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
+cd ../%{umingbuilddir}
for fconf in `ls *-ttf-arphic-uming*.conf`
do
- install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
- cd %{buildroot}%{_fontconfig_confdir}/ && \
- ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
- cd -
+ %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+ %__ln_s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
done
-cd %{ukaibuilddir}
+cd ../%{ukaibuilddir}
for fconf in `ls *-ttf-arphic-ukai*.conf`
do
- install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
- cd %{buildroot}%{_fontconfig_confdir}/ && \
- ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
- cd -
+ %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+ %__ln_s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
done
cd -
-# backward compat
-install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
-install -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-
-# catalogue
-%{__ln_s} %{umingfontdir} %{buildroot}%{catalogue}/%{name}-uming
-%{__ln_s} %{ukaifontdir} %{buildroot}%{catalogue}/%{name}-ukai
+# 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 -d %{buildroot}%{cidmapdir}
-install -m 0644 %{SOURCE3} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE4} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE5} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE6} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE7} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE8} %{buildroot}%{cidmapdir}/
-
-%clean
-rm -fr ${buildroot}
+%__install -m 0755 -d %{buildroot}%{gsdir}
+%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE4} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE5} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE6} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE7} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE8} %{buildroot}%{gsdir}/
-%post uming
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache -f %{umingfontdir}
-fi
-
-%post ukai
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache -f %{ukaifontdir}
-fi
-
-%postun uming
-if [ "$1" = 0 ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache -f %{_datadir}/fonts
- fi
-fi
-
-%postun ukai
-if [ "$1" = 0 ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache -f %{_datadir}/fonts
- fi
-fi
-
-%files uming
-%defattr(0644,root,root,0755)
-%doc %{umingbuilddir}/license
-%doc %{umingbuilddir}/CONTRIBUTERS
-%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
-%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
-%doc %{umingbuilddir}/FONTLOG
-%doc %{umingbuilddir}/INSTALL
-%doc %{umingbuilddir}/KNOWN_ISSUES
-%doc %{umingbuilddir}/NEWS
-%doc %{umingbuilddir}/README
-%doc %{umingbuilddir}/TODO
-%dir %{umingfontdir}
-%dir %{_datadir}/fonts/zh_CN
-%dir %{_datadir}/fonts/zh_TW
-%dir %{_datadir}/fonts/zh_CN/TrueType
-%dir %{_datadir}/fonts/zh_TW/TrueType
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
-%{umingfontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
-%verify(not md5 size mtime) %{umingfontdir}/fonts.dir
-%verify(not md5 size mtime) %{umingfontdir}/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}-uming
+# catalogue
+%__install -m 0755 -d %{buildroot}%{catalogue}
+%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{name}
-%files ukai
-%defattr(0644,root,root,0755)
-%doc %{ukaibuilddir}/license
-%doc %{ukaibuilddir}/CONTRIBUTERS
-%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
-%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
-%doc %{ukaibuilddir}/FONTLOG
-%doc %{ukaibuilddir}/INSTALL
-%doc %{ukaibuilddir}/KNOWN_ISSUES
-%doc %{ukaibuilddir}/NEWS
-%doc %{ukaibuilddir}/README
-%doc %{ukaibuilddir}/TODO
-%dir %{ukaifontdir}
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
-%{ukaifontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
-%verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
-%verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
-%{catalogue}/%{name}-ukai
+%clean
+%__rm -fr ${buildroot}
%changelog
+* 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.
+- Tidy up .spec file.
+
* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-12.fc11
- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
More information about the fedora-extras-commits
mailing list