Author: ueno Update of /cvs/pkgs/rpms/un-core-fonts/F-11 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21148/F-11
Modified Files: import.log un-core-fonts.spec Removed Files: un-core-fonts-batangbold-fontconfig.conf un-core-fonts-dinarubold-fontconfig.conf un-core-fonts-dinarulight-fontconfig.conf un-core-fonts-dotumbold-fontconfig.conf un-core-fonts-graphicbold-fontconfig.conf un-core-fonts-pilgibold-fontconfig.conf Log Message: - use _font_pkg macro (#581734) - don't install un-core-fonts-*{light,bold}-fontconfig.conf Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/un-core-fonts/F-11/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 15 Oct 2008 06:07:53 -0000 1.2 +++ import.log 27 Apr 2010 06:58:49 -0000 1.3 @@ -1,2 +1,3 @@ un-core-fonts-1_0_2-0_5_080608_fc10:HEAD:un-core-fonts-1.0.2-0.5.080608.fc10.src.rpm:1219645438 un-core-fonts-1_0_2-0_6_080608_fc9:HEAD:un-core-fonts-1.0.2-0.6.080608.fc9.src.rpm:1224050940 +un-core-fonts-1_0_2-0_11_080608_fc13:F-11:un-core-fonts-1.0.2-0.11.080608.fc13.src.rpm:1272351485 Index: un-core-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/un-core-fonts/F-11/un-core-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- un-core-fonts.spec 26 Jun 2009 04:39:12 -0000 1.4 +++ un-core-fonts.spec 27 Apr 2010 06:58:50 -0000 1.5 @@ -1,22 +1,21 @@ -%define fontname un-core -%define fontdir %{_datadir}/fonts/%{fontname}/ -%define fontconfdir %{_sysconfdir}/fonts/conf.d/ +%global fontname un-core +%global fontconf 65-%{fontname} -%define archivename un-fonts-core -%define alphatag 080608 +%global alphatag 080608 +%global archivename un-fonts-core-%{version}-%{alphatag} -%define common_desc_en \ +%global common_desc \ The UN set of Korean TrueType fonts is derived from the HLaTeX Type1 fonts \ made by Koaunghi Un in 1998. They were converted to TrueType with \ FontForge(PfaEdit) by Won-kyu Park in 2003. \ The Un Core set is composed of: \ \ -- UnBatang, UnBatangBold: serif \ -- UnDinaru, UnDinaruBold, UnDinaruLight: fantasy \ -- UnDotum, UnDotumBold: sans-serif \ -- UnGraphic, UnGraphicBold: sans-serif style \ +- UnBatang: serif \ +- UnDinaru: fantasy \ +- UnDotum: sans-serif \ +- UnGraphic: sans-serif style \ - UnGungseo: cursive, brush-stroke \ -- UnPilgi, UnPilgiBold: script \ +- UnPilgi: script %define common_desc_ko \ 은글꼴 시리즈는 HLaTex개발자이신 은광희님이 1998년에 개발한 폰트입니다. \ @@ -24,206 +23,135 @@ The Un Core set is composed of: \ 은글꼴은 가장 일반적인 글꼴들입니다. \ \ Core 모음: \ -- 은바탕, 은바탕굵은: serif \ -- 은디나루, 은디나루굵은, 은디나루가는: fantasy \ -- 은돋음, 은돋음굵은: sans-serif \ -- 은그래픽, 은그래픽굵은: sans-serif style \ +- 은바탕: serif \ +- 은디나루: fantasy \ +- 은돋음: sans-serif \ +- 은그래픽: sans-serif style \ - 은궁서: cursive, brush-stroke \ -- 은필기, 은필기굵은: script \ +- 은필기: script -Name: %{fontname}-fonts -Version: 1.0.2 -Release: 0.8.%{alphatag}%{?dist} -Summary: Un Core family of Korean TrueType fonts -Summary(ko): 한글 은글꼴 Core 모음 - -Group: User Interface/X -License: GPLv2 -URL: http://kldp.net/projects/unfonts/ -Source0: http://kldp.net/frs/download.php/4695/%{archivename}-%{version}-%{alphatag}.tar.gz -Source1: %{name}-batang-fontconfig.conf -Source2: %{name}-batangbold-fontconfig.conf -Source3: %{name}-dinaru-fontconfig.conf -Source4: %{name}-dinarubold-fontconfig.conf -Source5: %{name}-dinarulight-fontconfig.conf -Source6: %{name}-dotum-fontconfig.conf -Source7: %{name}-dotumbold-fontconfig.conf -Source8: %{name}-graphic-fontconfig.conf -Source9: %{name}-graphicbold-fontconfig.conf -Source10: %{name}-gungseo-fontconfig.conf -Source11: %{name}-pilgi-fontconfig.conf -Source12: %{name}-pilgibold-fontconfig.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: %{fontname}-fonts +Version: 1.0.2 +Release: 0.11.%{alphatag}%{?dist} +Summary: Un Core family of Korean TrueType fonts +Summary(ko): 한글 은글꼴 Core 모음 + +Group: User Interface/X +License: GPLv2 +URL: http://kldp.net/projects/unfonts/ +Source0: http://kldp.net/frs/download.php/4695/%{archivename}.tar.gz +Source1: %{name}-batang-fontconfig.conf +Source2: %{name}-dinaru-fontconfig.conf +Source3: %{name}-dotum-fontconfig.conf +Source4: %{name}-graphic-fontconfig.conf +Source5: %{name}-gungseo-fontconfig.conf +Source6: %{name}-pilgi-fontconfig.conf +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildArch: noarch +BuildRequires: fontpackages-devel + +%package common +Summary: Common files of Un Core fonts +Requires: fontpackages-filesystem -BuildArch: noarch +%description common +%common_desc +This package consists of files used by other %{name} packages. +# un_subpkg 1:name 2:Name 3:Hangul [4:obsolete] [5:obsolete] %define un_subpkg() \ -%package %1 \ -Summary: Un Core fonts - %(echo %2) \ -Summary(ko): 한글 은글꼴 Core 모음 - %(echo %3) \ -Group: User Interface/X \ +%package -n %{fontname}-%1-fonts \ +Summary: Un Core fonts - %(echo %2) \ +Summary(ko): 한글 은글꼴 Core 모음 - %(echo %3) \ +Group: User Interface/X \ +Requires: %{name}-common = %{version}-%{release} \ +Obsoletes: un-core-fonts-%1 < 1.0.2-0.9, %{?4:un-core-fonts-%{1}%{4} < 1.0.2-0.9}, %{?5:un-core-fonts-%{1}%{5} < 1.0.2-0.9} \ \ \ -%post %1 \ -if [ -x %{_bindir}/fc-cache ]; then \ - %{_bindir}/fc-cache %{fontdir} || : \ -fi \ -\ -\ -%postun %1 \ -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \ - %{_bindir}/fc-cache %{fontdir} || : \ -fi\ -\ -\ -%files %1 \ -%defattr(0644,root,root,0755) \ -%doc COPYING README \ -\ -%config(noreplace) %{fontconfdir}65-%{fontname}-%(echo %1).conf \ -\ -%dir %{fontdir} \ -%{fontdir}%(echo %2).ttf -%un_subpkg batang UnBatang 은바탕 -%un_subpkg batangbold UnBatangBold 은바탕굵은 -%un_subpkg dinaru UnDinaru 은디나루 -%un_subpkg dinarubold UnDinaruBold 은디나루굵은 -%un_subpkg dinarulight UnDinaruLight 은디나루가는 -%un_subpkg dotum UnDotum 은돋음 -%un_subpkg dotumbold UnDotumBold 은돋음굵은 -%un_subpkg graphic UnGraphic 은그래픽 -%un_subpkg graphicbold UnGraphicBold 은그래픽굵은 +%un_subpkg batang UnBatang 은바탕 bold +%un_subpkg dinaru UnDinaru 은디나루 bold light +%un_subpkg dotum UnDotum 은돋음 bold +%un_subpkg graphic UnGraphic 은그래픽 bold %un_subpkg gungseo UnGungseo 은궁서 -%un_subpkg pilgi UnPilgi 은필기 -%un_subpkg pilgibold UnPilgiBold 은필기긁은 +%un_subpkg pilgi UnPilgi 은필기 bold %description -%common_desc_en +%common_desc %description -l ko %common_desc_ko -%description batang -%common_desc_en +%description -n %{fontname}-batang-fonts +%common_desc This package includes UnBatang, a serif font. -%description -l ko batang +%description -l ko -n %{fontname}-batang-fonts %common_desc_ko 이 패키지에는 은바탕글꼴이 포함되어 있습니다. -%description batangbold -%common_desc_en - -This package includes UnBatangBold, a serif font. - -%description -l ko batangbold -%common_desc_ko - -이 패키지에는 은바탕굵은글꼴이 포함되어 있습니다. - -%description dinaru -%common_desc_en +%description -n %{fontname}-dinaru-fonts +%common_desc This package includes UnDinaru, a fantasy font. -%description -l ko dinaru +%description -l ko -n %{fontname}-dinaru-fonts %common_desc_ko 이 패키지에는 은디나루글꼴이 포함되어 있습니다. -%description dinarubold -%common_desc_en - -This package includes UnDinaruBold, a fantasy font. - -%description -l ko dinarubold -%common_desc_ko - -이 패키지에는 은디나루굵은글꼴이 포함되어 있습니다. - -%description dinarulight -%common_desc_en - -This package includes UnDinaruLight, a fantasy font. - -%description -l ko dinarulight -%common_desc_ko -이 패키지에는 은디나루가는글꼴이 포함되어 있습니다. - -%description dotum -%common_desc_en +%description -n %{fontname}-dotum-fonts +%common_desc This package includes UnDotum, a sans-serif font. -%description -l ko dotum +%description -l ko -n %{fontname}-dotum-fonts %common_desc_ko 이 패키지에는 은돋음글꼴이 포함되어 있습니다. -%description dotumbold -%common_desc_en - -This package includes UnDotum, a sans-serif font. - -%description -l ko dotumbold -%common_desc_ko - -이 패키지에는 은돋음굵은글꼴이 포함되어 있습니다. - -%description graphic -%common_desc_en +%description -n %{fontname}-graphic-fonts +%common_desc This package includes UnGraphic, a sans-serif font. -%description -l ko graphic +%description -l ko -n %{fontname}-graphic-fonts %common_desc_ko 이 패키지에는 은그래픽글꼴이 포함되어 있습니다. -%description graphicbold -%common_desc_en - -This package includes UnGraphicBold, a sans-serif font. - -%description -l ko graphicbold -%common_desc_ko - -이 패키지에는 은그래픽굵은글꼴이 포함되어 있습니다. - -%description gungseo -%common_desc_en +%description -n %{fontname}-gungseo-fonts +%common_desc This package includes UnGungseo, a cursive font. -%description -l ko gungseo +%description -l ko -n %{fontname}-gungseo-fonts %common_desc_ko 이 패키지에는 은궁서글꼴이 포함되어 있습니다. -%description pilgi -%common_desc_en +%description -n %{fontname}-pilgi-fonts +%common_desc This package includes UnPilgi, a script font. -%description -l ko pilgi +%description -l ko -n %{fontname}-pilgi-fonts %common_desc_ko 이 패키지에는 은필기글꼴이 포함되어 있습니다. -%description pilgibold -%common_desc_en - -This package includes UnPilgiBold, a script font. - -%description -l ko pilgibold -%common_desc_ko -이 패키지에는 은필기긁은글꼴이 포함되어 있습니다. +%_font_pkg -n batang -f %{fontconf}-batang.conf UnBatang.ttf UnBatangBold.ttf +%_font_pkg -n dinaru -f %{fontconf}-dinaru.conf UnDinaru.ttf UnDinaruLight.ttf UnDinaruBold.ttf +%_font_pkg -n dotum -f %{fontconf}-dotum.conf UnDotum.ttf UnDotumBold.ttf +%_font_pkg -n graphic -f %{fontconf}-graphic.conf UnGraphic.ttf UnGraphicBold.ttf +%_font_pkg -n gungseo -f %{fontconf}-gungseo.conf UnGungseo.ttf +%_font_pkg -n pilgi -f %{fontconf}-pilgi.conf UnPilgi.ttf UnPilgiBold.ttf %prep @@ -236,41 +164,58 @@ This package includes UnPilgiBold, a scr %install rm -rf %{buildroot} -install -dm 0755 -d %{buildroot}%{fontdir} -install -pm 0644 -p *.ttf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p *.ttf %{buildroot}%{_fontdir} -install -dm 0755 -d %{buildroot}%{fontconfdir} -install -pm 0644 -p %{SOURCE1}\ - %{buildroot}%{fontconfdir}65-%{fontname}-batang.conf -install -pm 0644 -p %{SOURCE2}\ - %{buildroot}%{fontconfdir}65-%{fontname}-batangbold.conf -install -pm 0644 -p %{SOURCE3}\ - %{buildroot}%{fontconfdir}65-%{fontname}-dinaru.conf -install -pm 0644 -p %{SOURCE4}\ - %{buildroot}%{fontconfdir}65-%{fontname}-dinarubold.conf -install -pm 0644 -p %{SOURCE5}\ - %{buildroot}%{fontconfdir}65-%{fontname}-dinarulight.conf -install -pm 0644 -p %{SOURCE6}\ - %{buildroot}%{fontconfdir}65-%{fontname}-dotum.conf -install -pm 0644 -p %{SOURCE7}\ - %{buildroot}%{fontconfdir}65-%{fontname}-dotumbold.conf -install -pm 0644 -p %{SOURCE8}\ - %{buildroot}%{fontconfdir}65-%{fontname}-graphic.conf -install -pm 0644 -p %{SOURCE9}\ - %{buildroot}%{fontconfdir}65-%{fontname}-graphicbold.conf -install -pm 0644 -p %{SOURCE10}\ - %{buildroot}%{fontconfdir}65-%{fontname}-gungseo.conf -install -pm 0644 -p %{SOURCE11}\ - %{buildroot}%{fontconfdir}65-%{fontname}-pilgi.conf -install -pm 0644 -p %{SOURCE12}\ - %{buildroot}%{fontconfdir}65-%{fontname}-pilgibold.conf +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +install -m 0644 -p %{SOURCE1}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-batang.conf +install -m 0644 -p %{SOURCE2}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dinaru.conf +install -m 0644 -p %{SOURCE3}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dotum.conf +install -m 0644 -p %{SOURCE4}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-graphic.conf +install -m 0644 -p %{SOURCE5}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gungseo.conf +install -m 0644 -p %{SOURCE6}\ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pilgi.conf + +for fconf in %{fontconf}-batang.conf \ + %{fontconf}-dinaru.conf \ + %{fontconf}-dotum.conf \ + %{fontconf}-graphic.conf \ + %{fontconf}-gungseo.conf \ + %{fontconf}-pilgi.conf ; do + ln -s %{_fontconfig_templatedir}/$fconf \ + %{buildroot}%{_fontconfig_confdir}/$fconf +done %clean rm -rf %{buildroot} +%files common +%defattr(0644,root,root,0755) +%doc COPYING README + + %changelog +* Mon Apr 26 2010 Daiki Ueno <du...@redhat.com> - 1.0.2-0.11.080608 +- use _font_pkg macro (#581734) +- don't install un-core-fonts-*{light,bold}-fontconfig.conf + +* Sun Jul 26 2009 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 1.0.2-0.10.080608 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 26 2009 Jens Petersen <peter...@redhat.com> - 1.0.2-0.9.080608 +- update to new fonts packaging and naming (#477474) +- moved bold (and light) weights into main subpackages (#468618) +- add obsoletes for renaming and former bold subpackages (#468618) + * Fri Jun 26 2009 Jens Petersen <peter...@redhat.com> - 1.0.2-0.8.080608 - fix filelist to only include specific font (#496795) --- un-core-fonts-batangbold-fontconfig.conf DELETED --- --- un-core-fonts-dinarubold-fontconfig.conf DELETED --- --- un-core-fonts-dinarulight-fontconfig.conf DELETED --- --- un-core-fonts-dotumbold-fontconfig.conf DELETED --- --- un-core-fonts-graphicbold-fontconfig.conf DELETED --- --- un-core-fonts-pilgibold-fontconfig.conf DELETED --- _______________________________________________ fonts-bugs mailing list fonts-bugs@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs http://fonts.fedoraproject.org/