From bbae6b76145cc98bc41768d9f06e43221d2ff87e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:50:53 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49275f25ab68696e12e3e7def00bf3085cf9ed11 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 Apr 2024 14:06:43 -0400 Subject: [PATCH 2/8] Fix flatpak build Some fonts do require mkfontdir/mkfontscale in %post, and therefore cannot be assumed to be in /usr. --- terminus-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 3965600..a76363e 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -121,7 +121,7 @@ BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) BuildRequires: /usr/bin/bdftopcf -BuildRequires: /usr/bin/mkfontdir +BuildRequires: mkfontdir ExcludeArch: %{grub2_exclude_arches} @@ -221,7 +221,7 @@ install -m 0755 -d %{buildroot}%{catalog} ln -s "$(echo '%{catalog}/%{fontfamily}:unscaled' | sed -e 's|[^/]||g' -e 's|/|../|g' -e 's|/../$||')%{legacy_x11_fontdir}" "%{buildroot}%{catalog}/%{fontfamily}:unscaled" test -d "%{buildroot}%{catalog}/%{fontfamily}:unscaled/" -/usr/bin/mkfontdir %{buildroot}%{legacy_x11_fontdir} +mkfontdir %{buildroot}%{legacy_x11_fontdir} test -f "%{buildroot}%{catalog}/%{fontfamily}:unscaled/fonts.dir" # Check automatic fonts do not contain unmatched wildcards From e19d307bbaa433c5d7b43160070b86a2a840c000 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:17:17 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From bd7a2622c885a60cf1a997779044d4229e2d9046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:20:57 +0200 Subject: [PATCH 4/8] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- terminus-fonts.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index a76363e..52cd2e6 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -136,7 +136,8 @@ Requires: kbd # For /usr/lib/kbd Requires: kbd-misc Summary: Clean fixed width font (console version) -License: OFL +# Automatically converted from old format: OFL - review is highly recommended. +License: LicenseRef-Callaway-OFL %description console %fontdescription @@ -147,7 +148,8 @@ This package contains the fonts to use with the Linux console. %package grub2 Requires: grub2-common Summary: Clean fixed width font (grub2 version) -License: OFL +# Automatically converted from old format: OFL - review is highly recommended. +License: LicenseRef-Callaway-OFL %description grub2 %fontdescription @@ -157,7 +159,8 @@ This package contains the fonts to use with the grub2 boot loader. %package legacy-x11 Summary: Clean fixed width font (legacy PCF version) -License: OFL +# Automatically converted from old format: OFL - review is highly recommended. +License: LicenseRef-Callaway-OFL # Require the fontconfig file Requires: %{name} = %{evr} From c65b0fa5f12f3adc18dd0feb13507f0400e8b4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 20 Dec 2024 07:28:48 +0000 Subject: [PATCH 5/8] Correct SPDX license Correction to previous automatic conversion. --- terminus-fonts.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 52cd2e6..ab9e696 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -7,7 +7,7 @@ Release: %autorelease -b 6 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} -%global fontlicense OFL +%global fontlicense OFL-1.1 # # The following directives are lists of space-separated shell globs # – matching files associated with the font family, @@ -136,8 +136,7 @@ Requires: kbd # For /usr/lib/kbd Requires: kbd-misc Summary: Clean fixed width font (console version) -# Automatically converted from old format: OFL - review is highly recommended. -License: LicenseRef-Callaway-OFL +License: OFL-1.1 %description console %fontdescription @@ -148,8 +147,7 @@ This package contains the fonts to use with the Linux console. %package grub2 Requires: grub2-common Summary: Clean fixed width font (grub2 version) -# Automatically converted from old format: OFL - review is highly recommended. -License: LicenseRef-Callaway-OFL +License: OFL-1.1 %description grub2 %fontdescription @@ -159,8 +157,7 @@ This package contains the fonts to use with the grub2 boot loader. %package legacy-x11 Summary: Clean fixed width font (legacy PCF version) -# Automatically converted from old format: OFL - review is highly recommended. -License: LicenseRef-Callaway-OFL +License: OFL-1.1 # Require the fontconfig file Requires: %{name} = %{evr} From 886f624cf3cb0f2238ead4655827a22e61b5c0cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:37:22 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fa4c1b7980b267020f339c92f5030d9f45e58dcb Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 7 Feb 2025 01:36:17 +0100 Subject: [PATCH 7/8] The file is called OFL.TXT, not OFL.txt --- terminus-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index ab9e696..cf39623 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -14,7 +14,7 @@ URL: http://terminus-font.sourceforge.net/ # – as they exist in the build root, # — at the end of the %%build stage: # – legal files (licensing…) -%global fontlicenses OFL.txt +%global fontlicenses OFL.TXT # – exclusions from the “fontlicenses” list %global fontlicensesex %{nil} # – documentation files From 3a5b1c53cb01c46a8b5ba8f0e9dd57af46234387 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:12:30 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild