Revert "4.49.1-12: Move consolefonts from /lib to /usr/lib"

This reverts commit 911b97174f. Fedora 32 still uses the /lib/kbd/consolefonts directory.
Merge branch 'f33' into f32
2021-04-18 23:36:16 +02:00 · 2021-02-07 03:45:08 +01:00 · 2020-06-02 14:45:18 +02:00
1 changed files with 7 additions and 10 deletions
--- 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 <hun@n-dimensional.de> - 4.49.1-12.1
+- Move consolefonts back from /usr/lib to /lib (only for F32)
+
 * Fri Feb  5 2021 Hans Ulrich Niedermann <hun@n-dimensional.de> - 4.49.1-12
 - Move consolefonts from /lib to /usr/lib like kbd has done (#1925696)
Author	SHA1	Message	Date
Hans Ulrich Niedermann	8ca2512f42	Revert "4.49.1-12: Move consolefonts from /lib to /usr/lib" This reverts commit `911b97174f`. Fedora 32 still uses the /lib/kbd/consolefonts directory.	2021-04-18 23:36:16 +02:00
Hans Ulrich Niedermann	4fe0a7db98	Merge branch 'f33' into f32 The f33 branch also builds for f32, and as f32 still had the broken spacing caused by sticking all the different font sizes into one *.otb files, we can now finally fix the spacing for f32.	2021-02-07 03:45:08 +01:00
Hans Ulrich Niedermann	9d4e93f7e1	Workaround wrong weight in Terminus.otb in fontconfig config file. Resolves: rhbz#1823637 Backported from master aka f33.	2020-06-02 14:45:18 +02:00