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)