Author: cchance Update of /cvs/pkgs/rpms/cjkuni-fonts/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9158
Modified Files: cjkuni-fonts.spec Log Message: * Fri Jun 26 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-25.fc11 - Resolves: rhbz#507637 (Missing fontset info: fixed by subpackaged -common.) Index: cjkuni-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-11/cjkuni-fonts.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- cjkuni-fonts.spec 19 Jun 2009 06:09:19 -0000 1.10 +++ cjkuni-fonts.spec 26 Jun 2009 03:50:20 -0000 1.11 @@ -10,6 +10,9 @@ the CJK Unifonts project. %define umingbuilddir %{fontname}-uming-fonts-%{version} %define ukaibuilddir %{fontname}-ukai-fonts-%{version} +%define umingdir %{_datadir}/fonts/cjkuni-uming +%define ukaidir %{_datadir}/fonts/cjkuni-ukai + %define _cncompatdir %{_datadir}/fonts/zh_CN %define _twcompatdir %{_datadir}/fonts/zh_TW %define cncompatdir %{_cncompatdir}/TrueType @@ -21,7 +24,7 @@ the CJK Unifonts project. Name: %{fontname}-fonts Version: 0.2.20080216.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Chinese Unicode TrueType fonts in Ming and Kai face. License: Arphic Group: User Interface/X @@ -49,7 +52,7 @@ BuildRequires: fontpackages-devel >= %package -n %{fontname}-uming-fonts Summary: Chinese Unicode TrueType font in Ming face. Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} +Requires: %{fontname}-uming-fonts-common = %{version}-%{release} Obsoletes: cjkunifonts-uming < 0.2.20080216.1-16 %description -n %{fontname}-uming-fonts @@ -57,9 +60,7 @@ Obsoletes: cjkunifonts-uming < 0.2.20 CJK Unifonts in Ming face. -%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc - -# remaining uming files +%files -n %{fontname}-uming-fonts %doc ../%{umingbuilddir}/license %doc ../%{umingbuilddir}/CONTRIBUTERS %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt @@ -70,11 +71,17 @@ CJK Unifonts in Ming face. %doc ../%{umingbuilddir}/NEWS %doc ../%{umingbuilddir}/README %doc ../%{umingbuilddir}/TODO +%dir %{umingdir} +%dir %{_fontconfig_templatedir} +%dir %{_fontconfig_confdir} +%{umingdir}/uming.ttc +%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf +%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-uming*.conf %package -n %{fontname}-ukai-fonts Summary: Chinese Unicode TrueType font in Kai face. Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} +Requires: %{fontname}-ukai-fonts-common = %{version}-%{release} Obsoletes: cjkunifonts-ukai < 0.2.20080216.1-16 %description -n %{fontname}-ukai-fonts @@ -82,9 +89,7 @@ Obsoletes: cjkunifonts-ukai < 0.2.200 CJK Unifonts in Kai face. -%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc - -# remaining ukai files +%files -n %{fontname}-ukai-fonts %doc ../%{ukaibuilddir}/license %doc ../%{ukaibuilddir}/CONTRIBUTERS %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt @@ -95,6 +100,11 @@ CJK Unifonts in Kai face. %doc ../%{ukaibuilddir}/NEWS %doc ../%{ukaibuilddir}/README %doc ../%{ukaibuilddir}/TODO +%dir %{_fontconfig_templatedir} +%dir %{_fontconfig_confdir} +%{ukaidir}/ukai.ttc +%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf +%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf %package -n %{fontname}-fonts-ghostscript Summary: Chinese Unicode TrueType font ghostscript files. @@ -136,16 +146,43 @@ CJK Unifonts common files. %files -n %{fontname}-fonts-common %defattr(0644,root,root,0755) -%dir %{_fontdir} -%{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} +%dir %{catalogue} +%verify(not md5 size mtime) %{catalogue}/%{name}-uming +%verify(not md5 size mtime) %{catalogue}/%{name}-ukai + +%package -n %{fontname}-uming-fonts-common +Summary: Chinese Unicode TrueType font uming common files. +Group: User Interface/X +Requires: %{fontname}-fonts-common = %{version}-%{release} +Obsoletes: cjkunifonts-common < 0.2.20080216.1-16 + +%description -n %{fontname}-uming-fonts-common +%common_desc + +CJK Unifonts uming common files. + +%files -n %{fontname}-uming-fonts-common +%defattr(0644,root,root,0755) +%dir %{umingdir} +%verify(not md5 size mtime) %{umingdir}/fonts.dir +%verify(not md5 size mtime) %{umingdir}/fonts.scale + +%package -n %{fontname}-ukai-fonts-common +Summary: Chinese Unicode TrueType font ukai common files. +Group: User Interface/X +Requires: %{fontname}-fonts-common = %{version}-%{release} +Obsoletes: cjkunifonts-common < 0.2.20080216.1-16 + +%description -n %{fontname}-ukai-fonts-common +%common_desc + +CJK Unifonts ukai common files. + +%files -n %{fontname}-ukai-fonts-common +%defattr(0644,root,root,0755) +%dir %{ukaidir} +%verify(not md5 size mtime) %{ukaidir}/fonts.dir +%verify(not md5 size mtime) %{ukaidir}/fonts.scale %package -n %{fontname}-fonts-compat Summary: Chinese Unicode TrueType font compatibility files. @@ -189,14 +226,22 @@ CJK Unifonts compatibility files. %__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}%{umingdir} +%__install -m 0755 -d %{buildroot}%{ukaidir} +%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/ +%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/ # fonts.{scale,dir} -%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \ - -o %{buildroot}%{_fontdir}/fonts.scale -%{_bindir}/mkfontdir %{buildroot}%{_fontdir} +cd %{buildroot}%{umingdir} +%{_bindir}/ttmkfdir -d %{buildroot}%{umingdir} \ + -o %{buildroot}%{umingdir}/fonts.scale +%{_bindir}/mkfontdir %{buildroot}%{umingdir} +cd - +cd %{buildroot}%{ukaidir} +%{_bindir}/ttmkfdir -d %{buildroot}%{ukaidir} \ + -o %{buildroot}%{ukaidir}/fonts.scale +%{_bindir}/mkfontdir %{buildroot}%{ukaidir} +cd - # *.conf %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} @@ -228,28 +273,32 @@ cd - # catalogue %__install -m 0755 -d %{buildroot}%{catalogue} -%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name} +%__ln_s %{umingdir} %{buildroot}%{catalogue}/%{name}-uming +%__ln_s %{ukaidir} %{buildroot}%{catalogue}/%{name}-ukai # backward compat to obsoleted ttf %__install -m 0755 -d %{buildroot}%{cncompatdir} %__install -m 0755 -d %{buildroot}%{twcompatdir} -%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf -%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf +%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf +%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf # backward compt to transition dir %__install -m 0755 -d %{buildroot}%{umingtransdir} %__install -m 0755 -d %{buildroot}%{ukaitransdir} -%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{umingtransdir}/uming.ttf -%__ln_s %{_fontdir}/fonts.dir %{buildroot}%{umingtransdir}/fonts.dir -%__ln_s %{_fontdir}/fonts.scale %{buildroot}%{umingtransdir}/fonts.scale -%__ln_s %{_fontdir}/ukai.ttc %{buildroot}%{ukaitransdir}/ukai.ttf -%__ln_s %{_fontdir}/fonts.dir %{buildroot}%{ukaitransdir}/fonts.dir -%__ln_s %{_fontdir}/fonts.scale %{buildroot}%{ukaitransdir}/fonts.scale +%__ln_s %{umingdir}/uming.ttc %{buildroot}%{umingtransdir}/uming.ttf +%__ln_s %{umingdir}/fonts.dir %{buildroot}%{umingtransdir}/fonts.dir +%__ln_s %{umingdir}/fonts.scale %{buildroot}%{umingtransdir}/fonts.scale +%__ln_s %{ukaidir}/ukai.ttc %{buildroot}%{ukaitransdir}/ukai.ttf +%__ln_s %{ukaidir}/fonts.dir %{buildroot}%{ukaitransdir}/fonts.dir +%__ln_s %{ukaidir}/fonts.scale %{buildroot}%{ukaitransdir}/fonts.scale %clean %__rm -fr %{buildroot} %changelog +* Fri Jun 26 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-25.fc11 +- Resolves: rhbz#507637 (Missing fontset info: fixed by subpackaged -common.) + * Fri Jun 19 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-24.fc11 - Resolves: rhbz#468193 (Compatibility to previous installed location.) _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list