diff --git a/terminus-fonts.spec b/terminus-fonts.spec index cf39623..68f040d 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,18 +3,18 @@ ######################################################################## Version: 4.49.1 -Release: %autorelease -b 6 +Release: 1 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} -%global fontlicense OFL-1.1 +%global fontlicense OFL # # 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,12 +116,13 @@ Source24: %{name}-README.fedora # For generating *.otb (OpenType bitmap font) files Source42: bitmapfonts2otb.py BuildRequires: make -BuildRequires: /usr/bin/ftdump +# EL9 does not have /usr/bin/ftdump, thus remove it +# Nor does the parent bitmapfonts2otb.py used in build BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) BuildRequires: /usr/bin/bdftopcf -BuildRequires: mkfontdir +BuildRequires: /usr/bin/mkfontdir ExcludeArch: %{grub2_exclude_arches} @@ -136,7 +137,7 @@ Requires: kbd # For /usr/lib/kbd Requires: kbd-misc Summary: Clean fixed width font (console version) -License: OFL-1.1 +License: OFL %description console %fontdescription @@ -147,7 +148,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-1.1 +License: OFL %description grub2 %fontdescription @@ -157,7 +158,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-1.1 +License: OFL # Require the fontconfig file Requires: %{name} = %{evr} @@ -221,7 +222,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/" -mkfontdir %{buildroot}%{legacy_x11_fontdir} +/usr/bin/mkfontdir %{buildroot}%{legacy_x11_fontdir} test -f "%{buildroot}%{catalog}/%{fontfamily}:unscaled/fonts.dir" # Check automatic fonts do not contain unmatched wildcards @@ -823,4 +824,6 @@ EOF %changelog -%autochangelog +* Thu Nov 09 2023 Ding-Yi Chen - 4.49.1-1 +- Initial EPEL-9 import +- Removed unused BuildRequires: /usr/bin/ftdump