From 9d4e93f7e17acc5ddc3e81301b4906edaaa3c42e Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 2 Jun 2020 14:45:18 +0200 Subject: [PATCH 1/2] Workaround wrong weight in Terminus.otb in fontconfig config file. Resolves: rhbz#1823637 Backported from master aka f33. --- terminus-fonts-fontconfig.conf | 16 ++++++++++++++++ terminus-fonts.spec | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/terminus-fonts-fontconfig.conf b/terminus-fonts-fontconfig.conf index 7000f66..d15a34e 100644 --- a/terminus-fonts-fontconfig.conf +++ b/terminus-fonts-fontconfig.conf @@ -1,6 +1,22 @@ + + + + Terminus + + + Regular + + + medium + + + regular + + + monospace diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 8e81307..9a4354e 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -50,7 +50,7 @@ plus CRT VGA-bold for 8x14 and 8x16. Name: %{fontname}-fonts Version: 4.48 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Clean fixed width font # The source package also contains a few GPLv2+ build helper scripts. @@ -484,6 +484,10 @@ ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled %changelog +* Tue Jun 2 2020 Akira TAGOH - 4.48-7 +- Workaround wrong weight in Terminus.otb in fontconfig config file. + Resolves: rhbz#1823637 + * Tue Apr 7 2020 Hans Ulrich Niedermann - 4.48-5 - List *.otb files explicitly (without wildcards) - Updated package descriptions and spec comments for more accuracy From 8ca2512f4278b6a6da22d5ee88eb3d70fbbdd988 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 18 Apr 2021 23:33:42 +0200 Subject: [PATCH 2/2] Revert "4.49.1-12: Move consolefonts from /lib to /usr/lib" This reverts commit 911b97174f08941c1e6869c3e52d88fb710e1583. Fedora 32 still uses the /lib/kbd/consolefonts directory. --- terminus-fonts.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index c68ad6b..75d27ae 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 12%{?dist} +Release: 12%{?dist}.1 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -64,14 +64,9 @@ plus CRT VGA-bold for 8x14 and 8x16. # The basename for upstream's source tarball %global archivename terminus-font-%{version} -# Copied from the kbd package. -# The %%{_exec_prefix}/lib part is correct even on x86_64. -# This is where kbd data files (like console fonts) are installed. -# No static libraries, shared objects, or executables are placed here. -%global kbddir %{_exec_prefix}/lib/kbd - -# This is the directory for the actualy console fonts. -%global console_fontdir %{kbddir}/consolefonts +# This is the directory where we install our console fonts. +# Owned by the kbd package, which hardcodes it as /lib/kbd (without macros). +%global console_fontdir /lib/kbd/consolefonts # The ExcludeArch from the grub2.spec file # @@ -129,7 +124,6 @@ BuildRequires: /usr/bin/grub2-mkfont %package console Requires: kbd -Requires: %{kbddir} Summary: Clean fixed width font (console version) License: OFL @@ -804,6 +798,9 @@ fi %changelog +* Sun Apr 18 2021 Hans Ulrich Niedermann - 4.49.1-12.1 +- Move consolefonts back from /usr/lib to /lib (only for F32) + * Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-12 - Move consolefonts from /lib to /usr/lib like kbd has done (#1925696)