diff options
Diffstat (limited to 'terminus-fonts.spec')
| -rw-r--r-- | terminus-fonts.spec | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 7f3e236..a71833b 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -1,15 +1,15 @@ %define fontname terminus %define fontconf 63-%{fontname}.conf -%define tarname terminus-font -%define archivename %{tarname}-%{version} +%define archivename terminus-font-%{version} + # This is the dir where we install our console fonts. -# Owned by the kbd package. -%define consolefontdir /%{_lib}/kbd/consolefonts +# Owned by the kbd package, which hardcodes it as /lib/kbd (without macros). +%define consolefontdir /lib/kbd/consolefonts -# Font catalogue -%define catalogue /etc/X11/fontpath.d +# Font catalog +%define catalog /etc/X11/fontpath.d Name: %{fontname}-fonts @@ -17,7 +17,7 @@ Name: %{fontname}-fonts # update versions on file changes. When in doubt use the timestamp of the most # recent file as version. Version: 4.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Clean fixed width font Provides: terminus-font-x11 = 4.28-2 Obsoletes: terminus-font-x11 < 4.28-2 @@ -39,7 +39,7 @@ BuildArch: noarch BuildRequires: fontpackages-devel Requires: fontpackages-filesystem -# First filesystem package verison to contain the %{catalogue} dir. +# First filesystem package verison to contain the %{catalog} dir. Requires: filesystem >= 2.4.11-1 BuildRequires: /usr/bin/bdftopcf @@ -121,8 +121,8 @@ ln -s \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} # We cannot run mkfontdir in %%post because %%post is generated by %%_font_pkg -install -m 0755 -d %{buildroot}%{catalogue} -ln -s %{_fontdir} %{buildroot}%{catalogue}/%{fontname}:unscaled +install -m 0755 -d %{buildroot}%{catalog} +ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled /usr/bin/mkfontdir %{buildroot}%{_fontdir} @@ -135,7 +135,7 @@ rm -fr %{buildroot} %doc README README-BG %doc docs/x11/README.fedora docs/x11/Xresources.example %dir %{_fontdir} -%{catalogue}/%{fontname}:unscaled +%{catalog}/%{fontname}:unscaled %{_fontdir}/fonts.dir @@ -342,6 +342,11 @@ rm -fr %{buildroot} %changelog +* Thu Feb 19 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 4.28-4 +- change catalog(ue) spelling to US English +- remove unnecessary macro definition of %%tarname +- properly define consolefontdir (no macros) + * Thu Feb 19 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 4.28-3 - generate fonts.dir at build time (bug 483589) |