diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 68f040d..cf39623 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,18 +3,18 @@ ######################################################################## Version: 4.49.1 -Release: 1 +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, # – 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 @@ -26,7 +26,7 @@ URL: http://terminus-font.sourceforge.net/ %global fontsummary Clean fixed width font # A container for additional subpackage declarations. %global fontpkgheader %{expand: -#Obsoletes: +#Obsoletes: } # # More shell glob lists: @@ -116,13 +116,12 @@ Source24: %{name}-README.fedora # For generating *.otb (OpenType bitmap font) files Source42: bitmapfonts2otb.py BuildRequires: make -# EL9 does not have /usr/bin/ftdump, thus remove it -# Nor does the parent bitmapfonts2otb.py used in build +BuildRequires: /usr/bin/ftdump BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) BuildRequires: /usr/bin/bdftopcf -BuildRequires: /usr/bin/mkfontdir +BuildRequires: mkfontdir ExcludeArch: %{grub2_exclude_arches} @@ -137,7 +136,7 @@ Requires: kbd # For /usr/lib/kbd Requires: kbd-misc Summary: Clean fixed width font (console version) -License: OFL +License: OFL-1.1 %description console %fontdescription @@ -148,7 +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) -License: OFL +License: OFL-1.1 %description grub2 %fontdescription @@ -158,7 +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) -License: OFL +License: OFL-1.1 # Require the fontconfig file Requires: %{name} = %{evr} @@ -222,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 @@ -824,6 +823,4 @@ EOF %changelog -* Thu Nov 09 2023 Ding-Yi Chen - 4.49.1-1 -- Initial EPEL-9 import -- Removed unused BuildRequires: /usr/bin/ftdump +%autochangelog