diff --git a/40-terminus-alias.conf b/40-terminus-alias.conf new file mode 100644 index 0000000..234b9af --- /dev/null +++ b/40-terminus-alias.conf @@ -0,0 +1,11 @@ + + + + + Terminus (TTF) + + Consoleet Terminus-32 Smooth + Consoleet Terminus-32 + + + diff --git a/consoleet-terminus-fonts.changes b/consoleet-terminus-fonts.changes index 6d5bc20..5d47804 100644 --- a/consoleet-terminus-fonts.changes +++ b/consoleet-terminus-fonts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 29 09:35:41 UTC 2021 - Jan Engelhardt + +- Obsolete terminus-ttf-fonts and add 40-terminus-alias.conf. + ------------------------------------------------------------------- Mon Sep 20 17:42:56 UTC 2021 - Jan Engelhardt diff --git a/consoleet-terminus-fonts.spec b/consoleet-terminus-fonts.spec index 5104198..55dbcac 100644 --- a/consoleet-terminus-fonts.spec +++ b/consoleet-terminus-fonts.spec @@ -25,9 +25,11 @@ Group: System/X11/Fonts URL: https://inai.de/projects/consoleet/ Source: https://inai.de/files/consoleet/consoleet-terminus-4.49.1.tar.zst Source2: https://inai.de/files/consoleet/consoleet-terminus-4.49.1.tar.zst.asc +Source3: 40-terminus-alias.conf BuildRequires: fontpackages-devel BuildRequires: zstd BuildArch: noarch +Obsoletes: terminus-ttf-fonts <= %version %reconfigure_fonts_prereq %description @@ -41,13 +43,20 @@ tar --use=zstd --strip-components=1 -xf %SOURCE0 %build %install -mkdir -p "%buildroot/%_ttfontsdir" +mkdir -p "%buildroot/%_ttfontsdir" "%buildroot/%_sysconfdir/fonts/conf.d" "%buildroot/%_datadir/fontconfig/conf.avail" cp -av *.otf "%buildroot/%_ttfontsdir/" +# Obsolete Terminus font variation from ax86 +cp -av "%_sourcedir/40-terminus-alias.conf" "%buildroot/%_datadir/fontconfig/conf.avail" +ln -s "%_datadir/fontconfig/conf.avail/40-terminus-alias.conf" "%buildroot/%_sysconfdir/fonts/conf.d/" %reconfigure_fonts_scriptlets %files %license OFL.txt +%dir %_sysconfdir/fonts +%dir %_sysconfdir/fonts/conf.d +%config %_sysconfdir/fonts/conf.d/*.conf %_ttfontsdir/ +%_datadir/fontconfig/ %changelog