From dfc942817bbfdea4468b5f75ee0d1870f5676f9d Mon Sep 17 00:00:00 2001 From: cchance Date: Jan 19 2009 04:40:23 +0000 Subject: - Resolves: rhbz#477332 - Package renaming for post-1.13 fontpackages. --- diff --git a/baekmuk-ttf-fonts.spec b/baekmuk-ttf-fonts.spec index 5df200c..0263fa7 100644 --- a/baekmuk-ttf-fonts.spec +++ b/baekmuk-ttf-fonts.spec @@ -3,13 +3,12 @@ %define common_desc \ This package provides the free Korean TrueType fonts. -%define fontdir %{_datadir}/fonts/%{fontname} %define gsdir %{_datadir}/ghostscript/conf.d %define catalogue %{_sysconfdir}/X11/fontpath.d Name: %{fontname}-fonts Version: 2.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Free Korean TrueType fonts Group: User Interface/X @@ -27,94 +26,95 @@ Obsoletes: fonts-korean BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -BuildRequires: fontpackages-devel, xorg-x11-font-utils, ttmkfdir >= 3.0.6 +BuildRequires: fontpackages-devel >= 1.13 , xorg-x11-font-utils +BuildRequires: ttmkfdir >= 3.0.6 %description %common_desc -%package common -Summary: Common files for Korean Baekmuk TrueType fonts -License: Baekmuk -Group: User Interface/X -Requires: fontpackages-filesystem -Conflicts: fonts-korean < 2.2-5 - -%description common -%common_desc - -This package contains some common files for Baekmuk Korean TrueType fonts. - -%package batang +%package -n %{fontname}-batang-fonts Summary: Korean Baekmuk TrueType Batang typeface License: Baekmuk Group: User Interface/X -Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6 -Requires: fontpackages-filesystem, %{name}-common +Obsoletes: ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6 +Obsoletes: %{name}-batang < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} -%description batang +%description -n %{fontname}-batang-fonts %common_desc -This package contains the Korean TrueType font Batang typeface. +Batang is Korean TrueType font in Serif typeface. %_font_pkg -n batang -f *-%{fontname}-batang*.conf batang.ttf -%verify(not md5 size mtime) %{fontdir}/fonts.dir -%verify(not md5 size mtime) %{fontdir}/fonts.scale -%verify(not md5 size mtime) %{catalogue}/%{fontname} - -%package dotum +%package -n %{fontname}-dotum-fonts Summary: Korean Baekmuk TrueType Dotum typeface License: Baekmuk Group: User Interface/X -Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6 -Requires: fontpackages-filesystem, %{name}-common +Obsoletes: ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6 +Obsoletes: %{name}-dotum < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} -%description dotum +%description -n %{fontname}-dotum-fonts %common_desc -This package contains the Korean TrueType font Dotum typeface. +Dotum is Korean TrueType font in San-serif typeface. %_font_pkg -n dotum -f *-%{fontname}-dotum*.conf dotum.ttf -%verify(not md5 size mtime) %{fontdir}/fonts.dir -%verify(not md5 size mtime) %{fontdir}/fonts.scale -%verify(not md5 size mtime) %{catalogue}/%{fontname} - -%package gulim +%package -n %{fontname}-gulim-fonts Summary: Korean Baekmuk TrueType Gulim typeface License: Baekmuk Group: User Interface/X -Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6 -Requires: fontpackages-filesystem, %{name}-common +Obsoletes: ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6 +Obsoletes: %{name}-gulim < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} -%description gulim +%description -n %{fontname}-gulim-fonts %common_desc -This package contains the Korean TrueType font Gulim typeface. +Gulim is Korean TrueType font in Monospace typeface. %_font_pkg -n gulim -f *-%{fontname}-gulim*.conf gulim.ttf -%verify(not md5 size mtime) %{fontdir}/fonts.dir -%verify(not md5 size mtime) %{fontdir}/fonts.scale -%verify(not md5 size mtime) %{catalogue}/%{fontname} - -%package hline +%package -n %{fontname}-hline-fonts Summary: Korean Baekmuk TrueType Headline typeface License: Baekmuk Group: User Interface/X -Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6 -Requires: fontpackages-filesystem, %{name}-common +Obsoletes: ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6 +Obsoletes: %{name}-hline < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} -%description hline +%description -n %{fontname}-hline-fonts %common_desc -This package contains the Korean TrueType font Headline typeface. +Headline is Korean TrueType font in Black face. %_font_pkg -n hline -f *-%{fontname}-hline*.conf hline.ttf -%verify(not md5 size mtime) %{fontdir}/fonts.dir -%verify(not md5 size mtime) %{fontdir}/fonts.scale +%package -n %{fontname}-common-fonts +Summary: Common files for Korean Baekmuk TrueType fonts +License: Baekmuk +Group: User Interface/X +Requires: fontpackages-filesystem >= 1.13 +Conflicts: fonts-korean < 2.2-5 + +%description -n %{fontname}-common-fonts +%common_desc + +This is common files for Baekmuk Korean TrueType fonts. + +%files -n %{fontname}-common-fonts +%defattr(0644,root,root,0755) +%verify(not md5 size mtime) %{_fontdir}/fonts.dir +%verify(not md5 size mtime) %{_fontdir}/fonts.scale %verify(not md5 size mtime) %{catalogue}/%{fontname} +%doc COPYRIGHT COPYRIGHT.ko README +%{gsdir}/ %prep %setup -q -n %{archivename} @@ -126,9 +126,9 @@ This package contains the Korean TrueType font Headline typeface. %__rm -rf %{buildroot} # font -%__install -d -m 0755 %{buildroot}%{fontdir} +%__install -d -m 0755 %{buildroot}%{_fontdir} for i in batang dotum gulim hline; do - %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir} + %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{_fontdir} done # fontconfig conf @@ -144,9 +144,9 @@ done cd - # 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} # ghostscript %__install -d -m 0755 %{buildroot}%{gsdir} @@ -155,7 +155,7 @@ cd - # catalogue %__install -d %{buildroot}%{catalogue} -%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{fontname} +%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{fontname} # convert Korean copyright file to utf8 %{_bindir}/iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko @@ -163,11 +163,11 @@ cd - %clean %__rm -rf %{buildroot} -%files common -%doc COPYRIGHT COPYRIGHT.ko README -%{gsdir}/ - %changelog +* Mon Jan 19 2009 Caius Chance - 2.2-13.fc11 +- Resolves: rhbz#477332 +- Package renaming for post-1.13 fontpackages. + * Fri Jan 16 2009 Caius Chance - 2.2-12.fc11 - Resolves: rhbz#477332 (Repatched buildsys error.)