From b65e3c950599fd50311519b75882f67b690afae6 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 25 Apr 2020 22:42:32 +0200 Subject: [PATCH 01/38] Rewrite spec file for new font macros Rewrite the spec file based on the new fonts-rpm-templates package's spectemplate-fonts-1-full.spec. This also splits off *.pcf.gz into a -legacy-x11 subpackage. --- ...-fontconfig.conf => 63-terminus-fonts.conf | 2 +- terminus-fonts-README.fedora | 14 + ...ample => terminus-fonts-Xresources.example | 0 ...ra => terminus-fonts-console-README.fedora | 2 +- terminus-fonts-legacy-x11-README.fedora | 15 + ...fonts-opentype-bitmap-via-fonttosfnt.patch | 0 terminus-fonts.README.fedora | 11 - terminus-fonts.rpmlintrc | 3 +- terminus-fonts.spec | 1069 +++++++++++------ 9 files changed, 716 insertions(+), 400 deletions(-) rename terminus-fonts-fontconfig.conf => 63-terminus-fonts.conf (81%) create mode 100644 terminus-fonts-README.fedora rename terminus-fonts.Xresources.example => terminus-fonts-Xresources.example (100%) rename terminus-fonts-console.README.fedora => terminus-fonts-console-README.fedora (97%) create mode 100644 terminus-fonts-legacy-x11-README.fedora rename terminus-font-opentype-bitmap-via-fonttosfnt.patch => terminus-fonts-opentype-bitmap-via-fonttosfnt.patch (100%) delete mode 100644 terminus-fonts.README.fedora diff --git a/terminus-fonts-fontconfig.conf b/63-terminus-fonts.conf similarity index 81% rename from terminus-fonts-fontconfig.conf rename to 63-terminus-fonts.conf index 7000f66..1f6afa5 100644 --- a/terminus-fonts-fontconfig.conf +++ b/63-terminus-fonts.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/terminus-fonts-README.fedora b/terminus-fonts-README.fedora new file mode 100644 index 0000000..1dff9c1 --- /dev/null +++ b/terminus-fonts-README.fedora @@ -0,0 +1,14 @@ +======================================================================== +User Information for the Fedora **terminus-fonts** package +======================================================================== + +For most contemporary software, the **terminus-fonts** package will +provide the Terminus font in the modern OpenType bitmap format. + +However, as of 2020-04, there is still software in widespread use +which cannot use fonts in OpenType bitmap format like e.g. GNU Emacs +26. + +If you want to use one of these software packges, you need to install +the **terminus-fonts-legacy-x11** package to install the Terminus font +in the legacy PCF format. diff --git a/terminus-fonts.Xresources.example b/terminus-fonts-Xresources.example similarity index 100% rename from terminus-fonts.Xresources.example rename to terminus-fonts-Xresources.example diff --git a/terminus-fonts-console.README.fedora b/terminus-fonts-console-README.fedora similarity index 97% rename from terminus-fonts-console.README.fedora rename to terminus-fonts-console-README.fedora index a63a512..3f8caf8 100644 --- a/terminus-fonts-console.README.fedora +++ b/terminus-fonts-console-README.fedora @@ -1,5 +1,5 @@ ======================================================================== -User Information for the Fedora terminus-font-console package +User Information for the Fedora **terminus-fonts-console** package ======================================================================== The console package just dumps the font files in the directory where diff --git a/terminus-fonts-legacy-x11-README.fedora b/terminus-fonts-legacy-x11-README.fedora new file mode 100644 index 0000000..e4fb638 --- /dev/null +++ b/terminus-fonts-legacy-x11-README.fedora @@ -0,0 +1,15 @@ +======================================================================== +User Information for the Fedora **terminus-fonts-legacy-x11** package +======================================================================== + +The **terminus-fonts-legacy-x11** package registers the Terminus font +with both fonts-conf(5) and the newer /etc/X11/fontpath.d mechanism +used by newer libXfont and xfs(1) versions. + +This makes the font available for both + + * traditional programs using libXfont or xfs (like xterm, xfontsel, + and older GNU Emacs) + + * slightly more modern programs using fontconfig but not OpenType + yet (like GNU Emacs 26). diff --git a/terminus-font-opentype-bitmap-via-fonttosfnt.patch b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch similarity index 100% rename from terminus-font-opentype-bitmap-via-fonttosfnt.patch rename to terminus-fonts-opentype-bitmap-via-fonttosfnt.patch diff --git a/terminus-fonts.README.fedora b/terminus-fonts.README.fedora deleted file mode 100644 index e903b2b..0000000 --- a/terminus-fonts.README.fedora +++ /dev/null @@ -1,11 +0,0 @@ -======================================================================== -User Information for the Fedora terminus-font-x11 package -======================================================================== - -The terminus-font-x11 package registers the Terminus font with both -fonts-conf(5) and the newer /etc/X11/fontpath.d mechanism used by newer -libXfont and xfs(1) versions. - -This makes the font available for both traditional programs using -libXfont or xfs (like xterm, xfontsel, emacs) and for modern programs -using fontconfig (like Gnome and KDE programs). diff --git a/terminus-fonts.rpmlintrc b/terminus-fonts.rpmlintrc index 1acd11a..783c0a9 100644 --- a/terminus-fonts.rpmlintrc +++ b/terminus-fonts.rpmlintrc @@ -1,5 +1,4 @@ # -*- python -*- -addFilter(r'hidden-file-or-dir /usr/share/fonts/terminus/.uuid') -addFilter(r'non-readable /usr/share/fonts/terminus/.uuid 0') addFilter(r'hardcoded-library-path in /lib/kbd/consolefonts') +addFilter(r'configure-without-libdir-spec') diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 8e81307..db47919 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -1,13 +1,72 @@ -%global fontname terminus -%global fontconf 63-%{fontname}.conf +######################################################################## +# Top definitions from spectemplate-fonts-1-full.spec +######################################################################## +Version: 4.48 +Release: 6%{?dist} +URL: http://terminus-font.sourceforge.net/ + +%global foundry %{nil} +%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 +# – exclusions from the “fontlicenses” list +%global fontlicensesex %{nil} +# – documentation files +%global fontdocs README README-BG docs/README.fedora +# – exclusions from the “fontdocs” list +%global fontdocsex %{fontlicenses} + +%global fontfamily terminus +%global fontsummary Clean fixed width font +# A container for additional subpackage declarations. +%global fontpkgheader %{expand: +#Obsoletes: +} +# +# More shell glob lists: +# – font family files +%global fonts Terminus.otb Terminus-Bold.otb +# – exclusions from the “fonts” list) +%global fontsex %{nil} +# – fontconfig files +%global fontconfs %{SOURCE10} +# – exclusions from the “fontconfs” list +%global fontconfsex %{nil} +# – appstream files, if any (generated automatically otherwise) +%global fontappstreams %{nil} +# – exclusions from the “fontappstreams” list +%global fontappstreamsex %{nil} +# +%global fontdescription %{expand: +The Terminus Font is a clean, fixed with bitmap font designed for long\ +(8 and more hours per day) work with computers.\ +\ +I contains more than 1300 characters, covers about 120 language sets and\ +supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254, KOI8-R/U/E/F,\ +Esperanto, and many IBM, Windows and Macintosh code pages, as well as\ +the IBM VGA, vt100 and xterm pseudo graphic characters.\ +\ +The sizes present are 6x12, 8x14, 8x16, 10x18, 10x20, 11x22, 12x24,\ +14x28, and 16x32. The weights are normal and bold (except for 6x12),\ +plus CRT VGA-bold for 8x14 and 8x16. +} + +######################################################################## +# Local macro definitions (i.e. not from spectemplate-fonts-1-full.spec) +######################################################################## + +# The basename for upstream's source tarball %global archivename terminus-font-%{version} - # This is the directory where we install our console fonts. # Owned by the kbd package, which hardcodes it as /lib/kbd (without macros). -%global consolefontdir /lib/kbd/consolefonts - +%global console_fontdir /lib/kbd/consolefonts # The ExcludeArch from the grub2.spec file # @@ -21,118 +80,100 @@ %endif # Owned by the grub2-common package -%global grub2fontdir /usr/share/grub +%global grub2_fontdir /usr/share/grub +%global legacy_x11_fontdir /usr/share/fonts/terminus-fonts-legacy-x11 # Font catalog %global catalog %{_sysconfdir}/X11/fontpath.d - -%global common_desc \ -The Terminus Font is a clean, fixed with bitmap font designed for long\ -(8 and more hours per day) work with computers.\ -\ -I contains more than 1300 characters, covers about 120 language sets and\ -supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254, KOI8-R/U/E/F,\ -Esperanto, and many IBM, Windows and Macintosh code pages, as well as\ -the IBM VGA, vt100 and xterm pseudo graphic characters.\ -\ -The sizes present are 6x12, 8x14, 8x16, 10x18, 10x20, 11x22, 12x24,\ -14x28, and 16x32. The weights are normal and bold (except for 6x12),\ -plus CRT VGA-bold for 8x14 and 8x16. - - %if %{?epoch: 1}%{?!epoch: 0} %global evr %{epoch}:%{version}-%{release} %else %global evr %{version}-%{release} %endif -Name: %{fontname}-fonts -Version: 4.48 -Release: 5%{?dist} -Summary: Clean fixed width font -# The source package also contains a few GPLv2+ build helper scripts. -License: OFL -URL: http://terminus-font.sourceforge.net/ -Source0: http://downloads.sourceforge.net/terminus-font/%{archivename}.tar.gz -Source1: %{name}-fontconfig.conf -Source2: bitmapfonts2otb.py -Source10: %{name}-console.README.fedora -Source20: %{name}.README.fedora -Source21: %{name}.Xresources.example +# From spectemplate-fonts-1-full.spec +Source0: https://downloads.sourceforge.net/terminus-font/%{archivename}.tar.gz +Source10: 63-%{fontpkgname}.conf -Patch42: terminus-font-opentype-bitmap-via-fonttosfnt.patch +# Local definitions +Source21: %{name}-console-README.fedora +Source22: %{name}-legacy-x11-README.fedora +Source23: %{name}-Xresources.example +Source24: %{name}-README.fedora -BuildArch: noarch -BuildRequires: fontpackages-devel >= 1.18 -Requires: fontpackages-filesystem +# For generating *.otb (OpenType bitmap font) files +Source42: bitmapfonts2otb.py +Patch42: %{name}-opentype-bitmap-via-fonttosfnt.patch +BuildRequires: /usr/bin/ftdump +BuildRequires: /usr/bin/fonttosfnt +BuildRequires: python3 > 3.5.0 -Obsoletes: terminus-font-x11 < 4.28-2 -Provides: terminus-font-x11 = %{evr} - -# For generating *.otb (OpenType bitmap font) -BuildRequires: /usr/bin/ftdump -BuildRequires: /usr/bin/fonttosfnt -BuildRequires: python3 - -BuildRequires: python3 >= 3.5.0 -BuildRequires: /usr/bin/bdftopcf -BuildRequires: /usr/bin/mkfontdir +# For generating legacy fonts (*.pcf) +BuildRequires: /usr/bin/bdftopcf +BuildRequires: /usr/bin/mkfontdir %ifnarch %{grub2_exclude_arches} -BuildRequires: /usr/bin/grub2-mkfont +BuildRequires: /usr/bin/grub2-mkfont %endif -%description -%common_desc -This package contains the OpenType bitmap fonts to use with -X11 and Wayland on Fedora 31 and later, and also the legacy -X11 PCF bitmap fonts for compatibility with older software. +%fontpkg %package console -Requires: kbd -Summary: Clean fixed width font (console version) -Obsoletes: terminus-font-console < 4.28-2 -Provides: terminus-font-console = %{evr} -License: OFL +Requires: kbd +Summary: Clean fixed width font (console version) +License: OFL %description console -%common_desc - +%fontdescription This package contains the fonts to use with the Linux console. %ifnarch %{grub2_exclude_arches} %package grub2 -Requires: grub2-common -Summary: Clean fixed width font (grub2 version) -License: OFL +Requires: grub2-common +Summary: Clean fixed width font (grub2 version) +License: OFL %description grub2 -%common_desc - +%fontdescription This package contains the fonts to use with the grub2 boot loader. %endif +%package legacy-x11 +Summary: Clean fixed width font (legacy PCF version) +License: OFL +# Require the fontconfig file +Requires: %{name} = %{evr} + +%description legacy-x11 +%fontdescription +This package contains the font variants to use with software still +relying on legacy PCF font rendering methods (e.g. GNU Emacs 26). + + %prep %setup -q -n %{archivename} -cp -p "%{SOURCE2}" ./bin +# Convert upstream files to UTF-8 and Unix end of lines if necessary +# Optional arguments: +# -e [encoding] source OS encoding (auto-detected otherwise) +# -n do not recode files, only adjust folding and end of lines +#linuxtext *.txt +cp -p "%{SOURCE42}" bin/ %patch42 -p1 -b .opentype-bitmap-via-fonttosfnt patch -s -p1 -b --suffix .dv1 -fuzz=0 -i alt/dv1.diff patch -s -p1 -b --suffix .ij1 -fuzz=0 -i alt/ij1.diff -chmod 755 configure iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG + %build -# The libdir is just to shut up rpmlint. Configure is nice enough to -# just ignore it. -./configure --prefix=%{_prefix} --libdir=%{_libdir} \ - --x11dir=%{_fontdir} --psfdir=%{consolefontdir} +./configure --prefix=%{_prefix} \ + --x11dir=%{legacy_x11_fontdir} --psfdir=%{console_fontdir} env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw otb %ifnarch %{grub2_exclude_arches} @@ -143,347 +184,605 @@ done %endif # Fedora specific docs and examples -mkdir -p docs/console docs/x11 -cp -p "%{SOURCE10}" docs/console/README.fedora -cp -p "%{SOURCE20}" docs/x11/README.fedora -cp -p "%{SOURCE21}" docs/x11/Xresources.example +mkdir -p docs/console docs/legacy-x11 +cp -p "%{SOURCE21}" docs/console/README.fedora +cp -p "%{SOURCE22}" docs/legacy-x11/README.fedora +cp -p "%{SOURCE23}" docs/legacy-x11/Xresources.example +cp -p "%{SOURCE24}" docs/README.fedora + +%fontbuild %install -make DESTDIR="%{buildroot}" PCF='$(PCF_10646_1) $(PCF_8BIT)' install-psf install-psf-ref install-psf-vgaw install-pcf install-otb +make DESTDIR="%{buildroot}" PCF='$(PCF_10646_1) $(PCF_8BIT)' install-psf install-psf-ref install-psf-vgaw install-pcf %ifnarch %{grub2_exclude_arches} # install *.pf2 for the grub2 bootloader -install -m 0755 -d %{buildroot}%{grub2fontdir} -install -m 0644 -t %{buildroot}%{grub2fontdir} ter-*.pf2 +install -m 0755 -d %{buildroot}%{grub2_fontdir} +install -m 0644 -t %{buildroot}%{grub2_fontdir} ter-*.pf2 %endif -# hook the OTB and legacy PCF fonts into fontconfig -install -m 0755 -d \ - %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} - -install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -ln -s \ - %{_fontconfig_templatedir}/%{fontconf} \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf} - # We cannot run mkfontdir in %%post because %%post is generated by %%_font_pkg install -m 0755 -d %{buildroot}%{catalog} -ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled -/usr/bin/mkfontdir %{buildroot}%{_fontdir} +ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled +/usr/bin/mkfontdir %{buildroot}%{legacy_x11_fontdir} + +%fontinstall -%_font_pkg -f %{fontconf} ter-*.pcf.gz Terminus.otb Terminus-Bold.otb +%check +%fontcheck + + +%fontfiles + + +%files legacy-x11 %doc README -%doc README-BG -%doc docs/x11/README.fedora -%doc docs/x11/Xresources.example -%{catalog}/%{fontname}:unscaled -%{_fontdir}/fonts.dir +%doc docs/legacy-x11/README.fedora +%doc docs/legacy-x11/Xresources.example +%{catalog}/%{fontfamily}:unscaled +%dir %{legacy_x11_fontdir}/ +%{legacy_x11_fontdir}/fonts.dir +%{legacy_x11_fontdir}/ter-112b.pcf.gz +%{legacy_x11_fontdir}/ter-112n.pcf.gz +%{legacy_x11_fontdir}/ter-114b.pcf.gz +%{legacy_x11_fontdir}/ter-114n.pcf.gz +%{legacy_x11_fontdir}/ter-116b.pcf.gz +%{legacy_x11_fontdir}/ter-116n.pcf.gz +%{legacy_x11_fontdir}/ter-118b.pcf.gz +%{legacy_x11_fontdir}/ter-118n.pcf.gz +%{legacy_x11_fontdir}/ter-120b.pcf.gz +%{legacy_x11_fontdir}/ter-120n.pcf.gz +%{legacy_x11_fontdir}/ter-122b.pcf.gz +%{legacy_x11_fontdir}/ter-122n.pcf.gz +%{legacy_x11_fontdir}/ter-124b.pcf.gz +%{legacy_x11_fontdir}/ter-124n.pcf.gz +%{legacy_x11_fontdir}/ter-128b.pcf.gz +%{legacy_x11_fontdir}/ter-128n.pcf.gz +%{legacy_x11_fontdir}/ter-132b.pcf.gz +%{legacy_x11_fontdir}/ter-132n.pcf.gz +%{legacy_x11_fontdir}/ter-212b.pcf.gz +%{legacy_x11_fontdir}/ter-212n.pcf.gz +%{legacy_x11_fontdir}/ter-214b.pcf.gz +%{legacy_x11_fontdir}/ter-214n.pcf.gz +%{legacy_x11_fontdir}/ter-216b.pcf.gz +%{legacy_x11_fontdir}/ter-216n.pcf.gz +%{legacy_x11_fontdir}/ter-218b.pcf.gz +%{legacy_x11_fontdir}/ter-218n.pcf.gz +%{legacy_x11_fontdir}/ter-220b.pcf.gz +%{legacy_x11_fontdir}/ter-220n.pcf.gz +%{legacy_x11_fontdir}/ter-222b.pcf.gz +%{legacy_x11_fontdir}/ter-222n.pcf.gz +%{legacy_x11_fontdir}/ter-224b.pcf.gz +%{legacy_x11_fontdir}/ter-224n.pcf.gz +%{legacy_x11_fontdir}/ter-228b.pcf.gz +%{legacy_x11_fontdir}/ter-228n.pcf.gz +%{legacy_x11_fontdir}/ter-232b.pcf.gz +%{legacy_x11_fontdir}/ter-232n.pcf.gz +%{legacy_x11_fontdir}/ter-512b.pcf.gz +%{legacy_x11_fontdir}/ter-512n.pcf.gz +%{legacy_x11_fontdir}/ter-514b.pcf.gz +%{legacy_x11_fontdir}/ter-514n.pcf.gz +%{legacy_x11_fontdir}/ter-516b.pcf.gz +%{legacy_x11_fontdir}/ter-516n.pcf.gz +%{legacy_x11_fontdir}/ter-518b.pcf.gz +%{legacy_x11_fontdir}/ter-518n.pcf.gz +%{legacy_x11_fontdir}/ter-520b.pcf.gz +%{legacy_x11_fontdir}/ter-520n.pcf.gz +%{legacy_x11_fontdir}/ter-522b.pcf.gz +%{legacy_x11_fontdir}/ter-522n.pcf.gz +%{legacy_x11_fontdir}/ter-524b.pcf.gz +%{legacy_x11_fontdir}/ter-524n.pcf.gz +%{legacy_x11_fontdir}/ter-528b.pcf.gz +%{legacy_x11_fontdir}/ter-528n.pcf.gz +%{legacy_x11_fontdir}/ter-532b.pcf.gz +%{legacy_x11_fontdir}/ter-532n.pcf.gz +%{legacy_x11_fontdir}/ter-712b.pcf.gz +%{legacy_x11_fontdir}/ter-712n.pcf.gz +%{legacy_x11_fontdir}/ter-714b.pcf.gz +%{legacy_x11_fontdir}/ter-714n.pcf.gz +%{legacy_x11_fontdir}/ter-716b.pcf.gz +%{legacy_x11_fontdir}/ter-716n.pcf.gz +%{legacy_x11_fontdir}/ter-718b.pcf.gz +%{legacy_x11_fontdir}/ter-718n.pcf.gz +%{legacy_x11_fontdir}/ter-720b.pcf.gz +%{legacy_x11_fontdir}/ter-720n.pcf.gz +%{legacy_x11_fontdir}/ter-722b.pcf.gz +%{legacy_x11_fontdir}/ter-722n.pcf.gz +%{legacy_x11_fontdir}/ter-724b.pcf.gz +%{legacy_x11_fontdir}/ter-724n.pcf.gz +%{legacy_x11_fontdir}/ter-728b.pcf.gz +%{legacy_x11_fontdir}/ter-728n.pcf.gz +%{legacy_x11_fontdir}/ter-732b.pcf.gz +%{legacy_x11_fontdir}/ter-732n.pcf.gz +%{legacy_x11_fontdir}/ter-912b.pcf.gz +%{legacy_x11_fontdir}/ter-912n.pcf.gz +%{legacy_x11_fontdir}/ter-914b.pcf.gz +%{legacy_x11_fontdir}/ter-914n.pcf.gz +%{legacy_x11_fontdir}/ter-916b.pcf.gz +%{legacy_x11_fontdir}/ter-916n.pcf.gz +%{legacy_x11_fontdir}/ter-918b.pcf.gz +%{legacy_x11_fontdir}/ter-918n.pcf.gz +%{legacy_x11_fontdir}/ter-920b.pcf.gz +%{legacy_x11_fontdir}/ter-920n.pcf.gz +%{legacy_x11_fontdir}/ter-922b.pcf.gz +%{legacy_x11_fontdir}/ter-922n.pcf.gz +%{legacy_x11_fontdir}/ter-924b.pcf.gz +%{legacy_x11_fontdir}/ter-924n.pcf.gz +%{legacy_x11_fontdir}/ter-928b.pcf.gz +%{legacy_x11_fontdir}/ter-928n.pcf.gz +%{legacy_x11_fontdir}/ter-932b.pcf.gz +%{legacy_x11_fontdir}/ter-932n.pcf.gz +%{legacy_x11_fontdir}/ter-c12b.pcf.gz +%{legacy_x11_fontdir}/ter-c12n.pcf.gz +%{legacy_x11_fontdir}/ter-c14b.pcf.gz +%{legacy_x11_fontdir}/ter-c14n.pcf.gz +%{legacy_x11_fontdir}/ter-c16b.pcf.gz +%{legacy_x11_fontdir}/ter-c16n.pcf.gz +%{legacy_x11_fontdir}/ter-c18b.pcf.gz +%{legacy_x11_fontdir}/ter-c18n.pcf.gz +%{legacy_x11_fontdir}/ter-c20b.pcf.gz +%{legacy_x11_fontdir}/ter-c20n.pcf.gz +%{legacy_x11_fontdir}/ter-c22b.pcf.gz +%{legacy_x11_fontdir}/ter-c22n.pcf.gz +%{legacy_x11_fontdir}/ter-c24b.pcf.gz +%{legacy_x11_fontdir}/ter-c24n.pcf.gz +%{legacy_x11_fontdir}/ter-c28b.pcf.gz +%{legacy_x11_fontdir}/ter-c28n.pcf.gz +%{legacy_x11_fontdir}/ter-c32b.pcf.gz +%{legacy_x11_fontdir}/ter-c32n.pcf.gz +%{legacy_x11_fontdir}/ter-d12b.pcf.gz +%{legacy_x11_fontdir}/ter-d12n.pcf.gz +%{legacy_x11_fontdir}/ter-d14b.pcf.gz +%{legacy_x11_fontdir}/ter-d14n.pcf.gz +%{legacy_x11_fontdir}/ter-d16b.pcf.gz +%{legacy_x11_fontdir}/ter-d16n.pcf.gz +%{legacy_x11_fontdir}/ter-d18b.pcf.gz +%{legacy_x11_fontdir}/ter-d18n.pcf.gz +%{legacy_x11_fontdir}/ter-d20b.pcf.gz +%{legacy_x11_fontdir}/ter-d20n.pcf.gz +%{legacy_x11_fontdir}/ter-d22b.pcf.gz +%{legacy_x11_fontdir}/ter-d22n.pcf.gz +%{legacy_x11_fontdir}/ter-d24b.pcf.gz +%{legacy_x11_fontdir}/ter-d24n.pcf.gz +%{legacy_x11_fontdir}/ter-d28b.pcf.gz +%{legacy_x11_fontdir}/ter-d28n.pcf.gz +%{legacy_x11_fontdir}/ter-d32b.pcf.gz +%{legacy_x11_fontdir}/ter-d32n.pcf.gz +%{legacy_x11_fontdir}/ter-f12b.pcf.gz +%{legacy_x11_fontdir}/ter-f12n.pcf.gz +%{legacy_x11_fontdir}/ter-f14b.pcf.gz +%{legacy_x11_fontdir}/ter-f14n.pcf.gz +%{legacy_x11_fontdir}/ter-f16b.pcf.gz +%{legacy_x11_fontdir}/ter-f16n.pcf.gz +%{legacy_x11_fontdir}/ter-f18b.pcf.gz +%{legacy_x11_fontdir}/ter-f18n.pcf.gz +%{legacy_x11_fontdir}/ter-f20b.pcf.gz +%{legacy_x11_fontdir}/ter-f20n.pcf.gz +%{legacy_x11_fontdir}/ter-f22b.pcf.gz +%{legacy_x11_fontdir}/ter-f22n.pcf.gz +%{legacy_x11_fontdir}/ter-f24b.pcf.gz +%{legacy_x11_fontdir}/ter-f24n.pcf.gz +%{legacy_x11_fontdir}/ter-f28b.pcf.gz +%{legacy_x11_fontdir}/ter-f28n.pcf.gz +%{legacy_x11_fontdir}/ter-f32b.pcf.gz +%{legacy_x11_fontdir}/ter-f32n.pcf.gz +%{legacy_x11_fontdir}/ter-g12b.pcf.gz +%{legacy_x11_fontdir}/ter-g12n.pcf.gz +%{legacy_x11_fontdir}/ter-g14b.pcf.gz +%{legacy_x11_fontdir}/ter-g14n.pcf.gz +%{legacy_x11_fontdir}/ter-g16b.pcf.gz +%{legacy_x11_fontdir}/ter-g16n.pcf.gz +%{legacy_x11_fontdir}/ter-g18b.pcf.gz +%{legacy_x11_fontdir}/ter-g18n.pcf.gz +%{legacy_x11_fontdir}/ter-g20b.pcf.gz +%{legacy_x11_fontdir}/ter-g20n.pcf.gz +%{legacy_x11_fontdir}/ter-g22b.pcf.gz +%{legacy_x11_fontdir}/ter-g22n.pcf.gz +%{legacy_x11_fontdir}/ter-g24b.pcf.gz +%{legacy_x11_fontdir}/ter-g24n.pcf.gz +%{legacy_x11_fontdir}/ter-g28b.pcf.gz +%{legacy_x11_fontdir}/ter-g28n.pcf.gz +%{legacy_x11_fontdir}/ter-g32b.pcf.gz +%{legacy_x11_fontdir}/ter-g32n.pcf.gz +%{legacy_x11_fontdir}/ter-i12b.pcf.gz +%{legacy_x11_fontdir}/ter-i12n.pcf.gz +%{legacy_x11_fontdir}/ter-i14b.pcf.gz +%{legacy_x11_fontdir}/ter-i14n.pcf.gz +%{legacy_x11_fontdir}/ter-i16b.pcf.gz +%{legacy_x11_fontdir}/ter-i16n.pcf.gz +%{legacy_x11_fontdir}/ter-i18b.pcf.gz +%{legacy_x11_fontdir}/ter-i18n.pcf.gz +%{legacy_x11_fontdir}/ter-i20b.pcf.gz +%{legacy_x11_fontdir}/ter-i20n.pcf.gz +%{legacy_x11_fontdir}/ter-i22b.pcf.gz +%{legacy_x11_fontdir}/ter-i22n.pcf.gz +%{legacy_x11_fontdir}/ter-i24b.pcf.gz +%{legacy_x11_fontdir}/ter-i24n.pcf.gz +%{legacy_x11_fontdir}/ter-i28b.pcf.gz +%{legacy_x11_fontdir}/ter-i28n.pcf.gz +%{legacy_x11_fontdir}/ter-i32b.pcf.gz +%{legacy_x11_fontdir}/ter-i32n.pcf.gz +%{legacy_x11_fontdir}/ter-k12b.pcf.gz +%{legacy_x11_fontdir}/ter-k12n.pcf.gz +%{legacy_x11_fontdir}/ter-k14b.pcf.gz +%{legacy_x11_fontdir}/ter-k14n.pcf.gz +%{legacy_x11_fontdir}/ter-k16b.pcf.gz +%{legacy_x11_fontdir}/ter-k16n.pcf.gz +%{legacy_x11_fontdir}/ter-k18b.pcf.gz +%{legacy_x11_fontdir}/ter-k18n.pcf.gz +%{legacy_x11_fontdir}/ter-k20b.pcf.gz +%{legacy_x11_fontdir}/ter-k20n.pcf.gz +%{legacy_x11_fontdir}/ter-k22b.pcf.gz +%{legacy_x11_fontdir}/ter-k22n.pcf.gz +%{legacy_x11_fontdir}/ter-k24b.pcf.gz +%{legacy_x11_fontdir}/ter-k24n.pcf.gz +%{legacy_x11_fontdir}/ter-k28b.pcf.gz +%{legacy_x11_fontdir}/ter-k28n.pcf.gz +%{legacy_x11_fontdir}/ter-k32b.pcf.gz +%{legacy_x11_fontdir}/ter-k32n.pcf.gz +%{legacy_x11_fontdir}/ter-p12b.pcf.gz +%{legacy_x11_fontdir}/ter-p12n.pcf.gz +%{legacy_x11_fontdir}/ter-p14b.pcf.gz +%{legacy_x11_fontdir}/ter-p14n.pcf.gz +%{legacy_x11_fontdir}/ter-p16b.pcf.gz +%{legacy_x11_fontdir}/ter-p16n.pcf.gz +%{legacy_x11_fontdir}/ter-p18b.pcf.gz +%{legacy_x11_fontdir}/ter-p18n.pcf.gz +%{legacy_x11_fontdir}/ter-p20b.pcf.gz +%{legacy_x11_fontdir}/ter-p20n.pcf.gz +%{legacy_x11_fontdir}/ter-p22b.pcf.gz +%{legacy_x11_fontdir}/ter-p22n.pcf.gz +%{legacy_x11_fontdir}/ter-p24b.pcf.gz +%{legacy_x11_fontdir}/ter-p24n.pcf.gz +%{legacy_x11_fontdir}/ter-p28b.pcf.gz +%{legacy_x11_fontdir}/ter-p28n.pcf.gz +%{legacy_x11_fontdir}/ter-p32b.pcf.gz +%{legacy_x11_fontdir}/ter-p32n.pcf.gz +%{legacy_x11_fontdir}/ter-u12b.pcf.gz +%{legacy_x11_fontdir}/ter-u12n.pcf.gz +%{legacy_x11_fontdir}/ter-u14b.pcf.gz +%{legacy_x11_fontdir}/ter-u14n.pcf.gz +%{legacy_x11_fontdir}/ter-u16b.pcf.gz +%{legacy_x11_fontdir}/ter-u16n.pcf.gz +%{legacy_x11_fontdir}/ter-u18b.pcf.gz +%{legacy_x11_fontdir}/ter-u18n.pcf.gz +%{legacy_x11_fontdir}/ter-u20b.pcf.gz +%{legacy_x11_fontdir}/ter-u20n.pcf.gz +%{legacy_x11_fontdir}/ter-u22b.pcf.gz +%{legacy_x11_fontdir}/ter-u22n.pcf.gz +%{legacy_x11_fontdir}/ter-u24b.pcf.gz +%{legacy_x11_fontdir}/ter-u24n.pcf.gz +%{legacy_x11_fontdir}/ter-u28b.pcf.gz +%{legacy_x11_fontdir}/ter-u28n.pcf.gz +%{legacy_x11_fontdir}/ter-u32b.pcf.gz +%{legacy_x11_fontdir}/ter-u32n.pcf.gz +%{legacy_x11_fontdir}/ter-x12b.pcf.gz +%{legacy_x11_fontdir}/ter-x12n.pcf.gz +%{legacy_x11_fontdir}/ter-x14b.pcf.gz +%{legacy_x11_fontdir}/ter-x14n.pcf.gz +%{legacy_x11_fontdir}/ter-x16b.pcf.gz +%{legacy_x11_fontdir}/ter-x16n.pcf.gz +%{legacy_x11_fontdir}/ter-x18b.pcf.gz +%{legacy_x11_fontdir}/ter-x18n.pcf.gz +%{legacy_x11_fontdir}/ter-x20b.pcf.gz +%{legacy_x11_fontdir}/ter-x20n.pcf.gz +%{legacy_x11_fontdir}/ter-x22b.pcf.gz +%{legacy_x11_fontdir}/ter-x22n.pcf.gz +%{legacy_x11_fontdir}/ter-x24b.pcf.gz +%{legacy_x11_fontdir}/ter-x24n.pcf.gz +%{legacy_x11_fontdir}/ter-x28b.pcf.gz +%{legacy_x11_fontdir}/ter-x28n.pcf.gz +%{legacy_x11_fontdir}/ter-x32b.pcf.gz +%{legacy_x11_fontdir}/ter-x32n.pcf.gz %files console %doc README %doc README-BG %doc docs/console/README.fedora -%doc %{consolefontdir}/README.terminus +%doc %{console_fontdir}/README.terminus # VGAW fonts -%{consolefontdir}/ter-114v.psf.gz -%{consolefontdir}/ter-116v.psf.gz -%{consolefontdir}/ter-214v.psf.gz -%{consolefontdir}/ter-216v.psf.gz -%{consolefontdir}/ter-714v.psf.gz -%{consolefontdir}/ter-716v.psf.gz -%{consolefontdir}/ter-914v.psf.gz -%{consolefontdir}/ter-916v.psf.gz -%{consolefontdir}/ter-c14v.psf.gz -%{consolefontdir}/ter-c16v.psf.gz -%{consolefontdir}/ter-d14v.psf.gz -%{consolefontdir}/ter-d16v.psf.gz -%{consolefontdir}/ter-g14v.psf.gz -%{consolefontdir}/ter-g16v.psf.gz -%{consolefontdir}/ter-h14v.psf.gz -%{consolefontdir}/ter-h16v.psf.gz -%{consolefontdir}/ter-i14v.psf.gz -%{consolefontdir}/ter-i16v.psf.gz -%{consolefontdir}/ter-k14v.psf.gz -%{consolefontdir}/ter-k16v.psf.gz -%{consolefontdir}/ter-m14v.psf.gz -%{consolefontdir}/ter-m16v.psf.gz -%{consolefontdir}/ter-p14v.psf.gz -%{consolefontdir}/ter-p16v.psf.gz -%{consolefontdir}/ter-u14v.psf.gz -%{consolefontdir}/ter-u16v.psf.gz -%{consolefontdir}/ter-v14v.psf.gz -%{consolefontdir}/ter-v16v.psf.gz +%{console_fontdir}/ter-114v.psf.gz +%{console_fontdir}/ter-116v.psf.gz +%{console_fontdir}/ter-214v.psf.gz +%{console_fontdir}/ter-216v.psf.gz +%{console_fontdir}/ter-714v.psf.gz +%{console_fontdir}/ter-716v.psf.gz +%{console_fontdir}/ter-914v.psf.gz +%{console_fontdir}/ter-916v.psf.gz +%{console_fontdir}/ter-c14v.psf.gz +%{console_fontdir}/ter-c16v.psf.gz +%{console_fontdir}/ter-d14v.psf.gz +%{console_fontdir}/ter-d16v.psf.gz +%{console_fontdir}/ter-g14v.psf.gz +%{console_fontdir}/ter-g16v.psf.gz +%{console_fontdir}/ter-h14v.psf.gz +%{console_fontdir}/ter-h16v.psf.gz +%{console_fontdir}/ter-i14v.psf.gz +%{console_fontdir}/ter-i16v.psf.gz +%{console_fontdir}/ter-k14v.psf.gz +%{console_fontdir}/ter-k16v.psf.gz +%{console_fontdir}/ter-m14v.psf.gz +%{console_fontdir}/ter-m16v.psf.gz +%{console_fontdir}/ter-p14v.psf.gz +%{console_fontdir}/ter-p16v.psf.gz +%{console_fontdir}/ter-u14v.psf.gz +%{console_fontdir}/ter-u16v.psf.gz +%{console_fontdir}/ter-v14v.psf.gz +%{console_fontdir}/ter-v16v.psf.gz # normal and bold (non-VGAW specific) fonts -%{consolefontdir}/ter-112n.psf.gz -%{consolefontdir}/ter-114b.psf.gz -%{consolefontdir}/ter-114n.psf.gz -%{consolefontdir}/ter-116b.psf.gz -%{consolefontdir}/ter-116n.psf.gz -%{consolefontdir}/ter-118b.psf.gz -%{consolefontdir}/ter-118n.psf.gz -%{consolefontdir}/ter-120b.psf.gz -%{consolefontdir}/ter-120n.psf.gz -%{consolefontdir}/ter-122b.psf.gz -%{consolefontdir}/ter-122n.psf.gz -%{consolefontdir}/ter-124b.psf.gz -%{consolefontdir}/ter-124n.psf.gz -%{consolefontdir}/ter-128b.psf.gz -%{consolefontdir}/ter-128n.psf.gz -%{consolefontdir}/ter-132b.psf.gz -%{consolefontdir}/ter-132n.psf.gz -%{consolefontdir}/ter-212n.psf.gz -%{consolefontdir}/ter-214b.psf.gz -%{consolefontdir}/ter-214n.psf.gz -%{consolefontdir}/ter-216b.psf.gz -%{consolefontdir}/ter-216n.psf.gz -%{consolefontdir}/ter-218b.psf.gz -%{consolefontdir}/ter-218n.psf.gz -%{consolefontdir}/ter-220b.psf.gz -%{consolefontdir}/ter-220n.psf.gz -%{consolefontdir}/ter-222b.psf.gz -%{consolefontdir}/ter-222n.psf.gz -%{consolefontdir}/ter-224b.psf.gz -%{consolefontdir}/ter-224n.psf.gz -%{consolefontdir}/ter-228b.psf.gz -%{consolefontdir}/ter-228n.psf.gz -%{consolefontdir}/ter-232b.psf.gz -%{consolefontdir}/ter-232n.psf.gz -%{consolefontdir}/ter-712n.psf.gz -%{consolefontdir}/ter-714b.psf.gz -%{consolefontdir}/ter-714n.psf.gz -%{consolefontdir}/ter-716b.psf.gz -%{consolefontdir}/ter-716n.psf.gz -%{consolefontdir}/ter-718b.psf.gz -%{consolefontdir}/ter-718n.psf.gz -%{consolefontdir}/ter-720b.psf.gz -%{consolefontdir}/ter-720n.psf.gz -%{consolefontdir}/ter-722b.psf.gz -%{consolefontdir}/ter-722n.psf.gz -%{consolefontdir}/ter-724b.psf.gz -%{consolefontdir}/ter-724n.psf.gz -%{consolefontdir}/ter-728b.psf.gz -%{consolefontdir}/ter-728n.psf.gz -%{consolefontdir}/ter-732b.psf.gz -%{consolefontdir}/ter-732n.psf.gz -%{consolefontdir}/ter-912n.psf.gz -%{consolefontdir}/ter-914b.psf.gz -%{consolefontdir}/ter-914n.psf.gz -%{consolefontdir}/ter-916b.psf.gz -%{consolefontdir}/ter-916n.psf.gz -%{consolefontdir}/ter-918b.psf.gz -%{consolefontdir}/ter-918n.psf.gz -%{consolefontdir}/ter-920b.psf.gz -%{consolefontdir}/ter-920n.psf.gz -%{consolefontdir}/ter-922b.psf.gz -%{consolefontdir}/ter-922n.psf.gz -%{consolefontdir}/ter-924b.psf.gz -%{consolefontdir}/ter-924n.psf.gz -%{consolefontdir}/ter-928b.psf.gz -%{consolefontdir}/ter-928n.psf.gz -%{consolefontdir}/ter-932b.psf.gz -%{consolefontdir}/ter-932n.psf.gz -%{consolefontdir}/ter-c12n.psf.gz -%{consolefontdir}/ter-c14b.psf.gz -%{consolefontdir}/ter-c14n.psf.gz -%{consolefontdir}/ter-c16b.psf.gz -%{consolefontdir}/ter-c16n.psf.gz -%{consolefontdir}/ter-c18b.psf.gz -%{consolefontdir}/ter-c18n.psf.gz -%{consolefontdir}/ter-c20b.psf.gz -%{consolefontdir}/ter-c20n.psf.gz -%{consolefontdir}/ter-c22b.psf.gz -%{consolefontdir}/ter-c22n.psf.gz -%{consolefontdir}/ter-c24b.psf.gz -%{consolefontdir}/ter-c24n.psf.gz -%{consolefontdir}/ter-c28b.psf.gz -%{consolefontdir}/ter-c28n.psf.gz -%{consolefontdir}/ter-c32b.psf.gz -%{consolefontdir}/ter-c32n.psf.gz -%{consolefontdir}/ter-d12n.psf.gz -%{consolefontdir}/ter-d14b.psf.gz -%{consolefontdir}/ter-d14n.psf.gz -%{consolefontdir}/ter-d16b.psf.gz -%{consolefontdir}/ter-d16n.psf.gz -%{consolefontdir}/ter-d18b.psf.gz -%{consolefontdir}/ter-d18n.psf.gz -%{consolefontdir}/ter-d20b.psf.gz -%{consolefontdir}/ter-d20n.psf.gz -%{consolefontdir}/ter-d22b.psf.gz -%{consolefontdir}/ter-d22n.psf.gz -%{consolefontdir}/ter-d24b.psf.gz -%{consolefontdir}/ter-d24n.psf.gz -%{consolefontdir}/ter-d28b.psf.gz -%{consolefontdir}/ter-d28n.psf.gz -%{consolefontdir}/ter-d32b.psf.gz -%{consolefontdir}/ter-d32n.psf.gz -%{consolefontdir}/ter-g12n.psf.gz -%{consolefontdir}/ter-g14b.psf.gz -%{consolefontdir}/ter-g14n.psf.gz -%{consolefontdir}/ter-g16b.psf.gz -%{consolefontdir}/ter-g16n.psf.gz -%{consolefontdir}/ter-g18b.psf.gz -%{consolefontdir}/ter-g18n.psf.gz -%{consolefontdir}/ter-g20b.psf.gz -%{consolefontdir}/ter-g20n.psf.gz -%{consolefontdir}/ter-g22b.psf.gz -%{consolefontdir}/ter-g22n.psf.gz -%{consolefontdir}/ter-g24b.psf.gz -%{consolefontdir}/ter-g24n.psf.gz -%{consolefontdir}/ter-g28b.psf.gz -%{consolefontdir}/ter-g28n.psf.gz -%{consolefontdir}/ter-g32b.psf.gz -%{consolefontdir}/ter-g32n.psf.gz -%{consolefontdir}/ter-h12n.psf.gz -%{consolefontdir}/ter-h14b.psf.gz -%{consolefontdir}/ter-h14n.psf.gz -%{consolefontdir}/ter-h16b.psf.gz -%{consolefontdir}/ter-h16n.psf.gz -%{consolefontdir}/ter-h18b.psf.gz -%{consolefontdir}/ter-h18n.psf.gz -%{consolefontdir}/ter-h20b.psf.gz -%{consolefontdir}/ter-h20n.psf.gz -%{consolefontdir}/ter-h22b.psf.gz -%{consolefontdir}/ter-h22n.psf.gz -%{consolefontdir}/ter-h24b.psf.gz -%{consolefontdir}/ter-h24n.psf.gz -%{consolefontdir}/ter-h28b.psf.gz -%{consolefontdir}/ter-h28n.psf.gz -%{consolefontdir}/ter-h32b.psf.gz -%{consolefontdir}/ter-h32n.psf.gz -%{consolefontdir}/ter-i12n.psf.gz -%{consolefontdir}/ter-i14b.psf.gz -%{consolefontdir}/ter-i14n.psf.gz -%{consolefontdir}/ter-i16b.psf.gz -%{consolefontdir}/ter-i16n.psf.gz -%{consolefontdir}/ter-i18b.psf.gz -%{consolefontdir}/ter-i18n.psf.gz -%{consolefontdir}/ter-i20b.psf.gz -%{consolefontdir}/ter-i20n.psf.gz -%{consolefontdir}/ter-i22b.psf.gz -%{consolefontdir}/ter-i22n.psf.gz -%{consolefontdir}/ter-i24b.psf.gz -%{consolefontdir}/ter-i24n.psf.gz -%{consolefontdir}/ter-i28b.psf.gz -%{consolefontdir}/ter-i28n.psf.gz -%{consolefontdir}/ter-i32b.psf.gz -%{consolefontdir}/ter-i32n.psf.gz -%{consolefontdir}/ter-k12n.psf.gz -%{consolefontdir}/ter-k14b.psf.gz -%{consolefontdir}/ter-k14n.psf.gz -%{consolefontdir}/ter-k16b.psf.gz -%{consolefontdir}/ter-k16n.psf.gz -%{consolefontdir}/ter-k18b.psf.gz -%{consolefontdir}/ter-k18n.psf.gz -%{consolefontdir}/ter-k20b.psf.gz -%{consolefontdir}/ter-k20n.psf.gz -%{consolefontdir}/ter-k22b.psf.gz -%{consolefontdir}/ter-k22n.psf.gz -%{consolefontdir}/ter-k24b.psf.gz -%{consolefontdir}/ter-k24n.psf.gz -%{consolefontdir}/ter-k28b.psf.gz -%{consolefontdir}/ter-k28n.psf.gz -%{consolefontdir}/ter-k32b.psf.gz -%{consolefontdir}/ter-k32n.psf.gz -%{consolefontdir}/ter-m12n.psf.gz -%{consolefontdir}/ter-m14b.psf.gz -%{consolefontdir}/ter-m14n.psf.gz -%{consolefontdir}/ter-m16b.psf.gz -%{consolefontdir}/ter-m16n.psf.gz -%{consolefontdir}/ter-m18b.psf.gz -%{consolefontdir}/ter-m18n.psf.gz -%{consolefontdir}/ter-m20b.psf.gz -%{consolefontdir}/ter-m20n.psf.gz -%{consolefontdir}/ter-m22b.psf.gz -%{consolefontdir}/ter-m22n.psf.gz -%{consolefontdir}/ter-m24b.psf.gz -%{consolefontdir}/ter-m24n.psf.gz -%{consolefontdir}/ter-m28b.psf.gz -%{consolefontdir}/ter-m28n.psf.gz -%{consolefontdir}/ter-m32b.psf.gz -%{consolefontdir}/ter-m32n.psf.gz -%{consolefontdir}/ter-p12n.psf.gz -%{consolefontdir}/ter-p14b.psf.gz -%{consolefontdir}/ter-p14n.psf.gz -%{consolefontdir}/ter-p16b.psf.gz -%{consolefontdir}/ter-p16n.psf.gz -%{consolefontdir}/ter-p18b.psf.gz -%{consolefontdir}/ter-p18n.psf.gz -%{consolefontdir}/ter-p20b.psf.gz -%{consolefontdir}/ter-p20n.psf.gz -%{consolefontdir}/ter-p22b.psf.gz -%{consolefontdir}/ter-p22n.psf.gz -%{consolefontdir}/ter-p24b.psf.gz -%{consolefontdir}/ter-p24n.psf.gz -%{consolefontdir}/ter-p28b.psf.gz -%{consolefontdir}/ter-p28n.psf.gz -%{consolefontdir}/ter-p32b.psf.gz -%{consolefontdir}/ter-p32n.psf.gz -%{consolefontdir}/ter-u12n.psf.gz -%{consolefontdir}/ter-u14b.psf.gz -%{consolefontdir}/ter-u14n.psf.gz -%{consolefontdir}/ter-u16b.psf.gz -%{consolefontdir}/ter-u16n.psf.gz -%{consolefontdir}/ter-u18b.psf.gz -%{consolefontdir}/ter-u18n.psf.gz -%{consolefontdir}/ter-u20b.psf.gz -%{consolefontdir}/ter-u20n.psf.gz -%{consolefontdir}/ter-u22b.psf.gz -%{consolefontdir}/ter-u22n.psf.gz -%{consolefontdir}/ter-u24b.psf.gz -%{consolefontdir}/ter-u24n.psf.gz -%{consolefontdir}/ter-u28b.psf.gz -%{consolefontdir}/ter-u28n.psf.gz -%{consolefontdir}/ter-u32b.psf.gz -%{consolefontdir}/ter-u32n.psf.gz -%{consolefontdir}/ter-v12n.psf.gz -%{consolefontdir}/ter-v14b.psf.gz -%{consolefontdir}/ter-v14n.psf.gz -%{consolefontdir}/ter-v16b.psf.gz -%{consolefontdir}/ter-v16n.psf.gz -%{consolefontdir}/ter-v18b.psf.gz -%{consolefontdir}/ter-v18n.psf.gz -%{consolefontdir}/ter-v20b.psf.gz -%{consolefontdir}/ter-v20n.psf.gz -%{consolefontdir}/ter-v22b.psf.gz -%{consolefontdir}/ter-v22n.psf.gz -%{consolefontdir}/ter-v24b.psf.gz -%{consolefontdir}/ter-v24n.psf.gz -%{consolefontdir}/ter-v28b.psf.gz -%{consolefontdir}/ter-v28n.psf.gz -%{consolefontdir}/ter-v32b.psf.gz -%{consolefontdir}/ter-v32n.psf.gz +%{console_fontdir}/ter-112n.psf.gz +%{console_fontdir}/ter-114b.psf.gz +%{console_fontdir}/ter-114n.psf.gz +%{console_fontdir}/ter-116b.psf.gz +%{console_fontdir}/ter-116n.psf.gz +%{console_fontdir}/ter-118b.psf.gz +%{console_fontdir}/ter-118n.psf.gz +%{console_fontdir}/ter-120b.psf.gz +%{console_fontdir}/ter-120n.psf.gz +%{console_fontdir}/ter-122b.psf.gz +%{console_fontdir}/ter-122n.psf.gz +%{console_fontdir}/ter-124b.psf.gz +%{console_fontdir}/ter-124n.psf.gz +%{console_fontdir}/ter-128b.psf.gz +%{console_fontdir}/ter-128n.psf.gz +%{console_fontdir}/ter-132b.psf.gz +%{console_fontdir}/ter-132n.psf.gz +%{console_fontdir}/ter-212n.psf.gz +%{console_fontdir}/ter-214b.psf.gz +%{console_fontdir}/ter-214n.psf.gz +%{console_fontdir}/ter-216b.psf.gz +%{console_fontdir}/ter-216n.psf.gz +%{console_fontdir}/ter-218b.psf.gz +%{console_fontdir}/ter-218n.psf.gz +%{console_fontdir}/ter-220b.psf.gz +%{console_fontdir}/ter-220n.psf.gz +%{console_fontdir}/ter-222b.psf.gz +%{console_fontdir}/ter-222n.psf.gz +%{console_fontdir}/ter-224b.psf.gz +%{console_fontdir}/ter-224n.psf.gz +%{console_fontdir}/ter-228b.psf.gz +%{console_fontdir}/ter-228n.psf.gz +%{console_fontdir}/ter-232b.psf.gz +%{console_fontdir}/ter-232n.psf.gz +%{console_fontdir}/ter-712n.psf.gz +%{console_fontdir}/ter-714b.psf.gz +%{console_fontdir}/ter-714n.psf.gz +%{console_fontdir}/ter-716b.psf.gz +%{console_fontdir}/ter-716n.psf.gz +%{console_fontdir}/ter-718b.psf.gz +%{console_fontdir}/ter-718n.psf.gz +%{console_fontdir}/ter-720b.psf.gz +%{console_fontdir}/ter-720n.psf.gz +%{console_fontdir}/ter-722b.psf.gz +%{console_fontdir}/ter-722n.psf.gz +%{console_fontdir}/ter-724b.psf.gz +%{console_fontdir}/ter-724n.psf.gz +%{console_fontdir}/ter-728b.psf.gz +%{console_fontdir}/ter-728n.psf.gz +%{console_fontdir}/ter-732b.psf.gz +%{console_fontdir}/ter-732n.psf.gz +%{console_fontdir}/ter-912n.psf.gz +%{console_fontdir}/ter-914b.psf.gz +%{console_fontdir}/ter-914n.psf.gz +%{console_fontdir}/ter-916b.psf.gz +%{console_fontdir}/ter-916n.psf.gz +%{console_fontdir}/ter-918b.psf.gz +%{console_fontdir}/ter-918n.psf.gz +%{console_fontdir}/ter-920b.psf.gz +%{console_fontdir}/ter-920n.psf.gz +%{console_fontdir}/ter-922b.psf.gz +%{console_fontdir}/ter-922n.psf.gz +%{console_fontdir}/ter-924b.psf.gz +%{console_fontdir}/ter-924n.psf.gz +%{console_fontdir}/ter-928b.psf.gz +%{console_fontdir}/ter-928n.psf.gz +%{console_fontdir}/ter-932b.psf.gz +%{console_fontdir}/ter-932n.psf.gz +%{console_fontdir}/ter-c12n.psf.gz +%{console_fontdir}/ter-c14b.psf.gz +%{console_fontdir}/ter-c14n.psf.gz +%{console_fontdir}/ter-c16b.psf.gz +%{console_fontdir}/ter-c16n.psf.gz +%{console_fontdir}/ter-c18b.psf.gz +%{console_fontdir}/ter-c18n.psf.gz +%{console_fontdir}/ter-c20b.psf.gz +%{console_fontdir}/ter-c20n.psf.gz +%{console_fontdir}/ter-c22b.psf.gz +%{console_fontdir}/ter-c22n.psf.gz +%{console_fontdir}/ter-c24b.psf.gz +%{console_fontdir}/ter-c24n.psf.gz +%{console_fontdir}/ter-c28b.psf.gz +%{console_fontdir}/ter-c28n.psf.gz +%{console_fontdir}/ter-c32b.psf.gz +%{console_fontdir}/ter-c32n.psf.gz +%{console_fontdir}/ter-d12n.psf.gz +%{console_fontdir}/ter-d14b.psf.gz +%{console_fontdir}/ter-d14n.psf.gz +%{console_fontdir}/ter-d16b.psf.gz +%{console_fontdir}/ter-d16n.psf.gz +%{console_fontdir}/ter-d18b.psf.gz +%{console_fontdir}/ter-d18n.psf.gz +%{console_fontdir}/ter-d20b.psf.gz +%{console_fontdir}/ter-d20n.psf.gz +%{console_fontdir}/ter-d22b.psf.gz +%{console_fontdir}/ter-d22n.psf.gz +%{console_fontdir}/ter-d24b.psf.gz +%{console_fontdir}/ter-d24n.psf.gz +%{console_fontdir}/ter-d28b.psf.gz +%{console_fontdir}/ter-d28n.psf.gz +%{console_fontdir}/ter-d32b.psf.gz +%{console_fontdir}/ter-d32n.psf.gz +%{console_fontdir}/ter-g12n.psf.gz +%{console_fontdir}/ter-g14b.psf.gz +%{console_fontdir}/ter-g14n.psf.gz +%{console_fontdir}/ter-g16b.psf.gz +%{console_fontdir}/ter-g16n.psf.gz +%{console_fontdir}/ter-g18b.psf.gz +%{console_fontdir}/ter-g18n.psf.gz +%{console_fontdir}/ter-g20b.psf.gz +%{console_fontdir}/ter-g20n.psf.gz +%{console_fontdir}/ter-g22b.psf.gz +%{console_fontdir}/ter-g22n.psf.gz +%{console_fontdir}/ter-g24b.psf.gz +%{console_fontdir}/ter-g24n.psf.gz +%{console_fontdir}/ter-g28b.psf.gz +%{console_fontdir}/ter-g28n.psf.gz +%{console_fontdir}/ter-g32b.psf.gz +%{console_fontdir}/ter-g32n.psf.gz +%{console_fontdir}/ter-h12n.psf.gz +%{console_fontdir}/ter-h14b.psf.gz +%{console_fontdir}/ter-h14n.psf.gz +%{console_fontdir}/ter-h16b.psf.gz +%{console_fontdir}/ter-h16n.psf.gz +%{console_fontdir}/ter-h18b.psf.gz +%{console_fontdir}/ter-h18n.psf.gz +%{console_fontdir}/ter-h20b.psf.gz +%{console_fontdir}/ter-h20n.psf.gz +%{console_fontdir}/ter-h22b.psf.gz +%{console_fontdir}/ter-h22n.psf.gz +%{console_fontdir}/ter-h24b.psf.gz +%{console_fontdir}/ter-h24n.psf.gz +%{console_fontdir}/ter-h28b.psf.gz +%{console_fontdir}/ter-h28n.psf.gz +%{console_fontdir}/ter-h32b.psf.gz +%{console_fontdir}/ter-h32n.psf.gz +%{console_fontdir}/ter-i12n.psf.gz +%{console_fontdir}/ter-i14b.psf.gz +%{console_fontdir}/ter-i14n.psf.gz +%{console_fontdir}/ter-i16b.psf.gz +%{console_fontdir}/ter-i16n.psf.gz +%{console_fontdir}/ter-i18b.psf.gz +%{console_fontdir}/ter-i18n.psf.gz +%{console_fontdir}/ter-i20b.psf.gz +%{console_fontdir}/ter-i20n.psf.gz +%{console_fontdir}/ter-i22b.psf.gz +%{console_fontdir}/ter-i22n.psf.gz +%{console_fontdir}/ter-i24b.psf.gz +%{console_fontdir}/ter-i24n.psf.gz +%{console_fontdir}/ter-i28b.psf.gz +%{console_fontdir}/ter-i28n.psf.gz +%{console_fontdir}/ter-i32b.psf.gz +%{console_fontdir}/ter-i32n.psf.gz +%{console_fontdir}/ter-k12n.psf.gz +%{console_fontdir}/ter-k14b.psf.gz +%{console_fontdir}/ter-k14n.psf.gz +%{console_fontdir}/ter-k16b.psf.gz +%{console_fontdir}/ter-k16n.psf.gz +%{console_fontdir}/ter-k18b.psf.gz +%{console_fontdir}/ter-k18n.psf.gz +%{console_fontdir}/ter-k20b.psf.gz +%{console_fontdir}/ter-k20n.psf.gz +%{console_fontdir}/ter-k22b.psf.gz +%{console_fontdir}/ter-k22n.psf.gz +%{console_fontdir}/ter-k24b.psf.gz +%{console_fontdir}/ter-k24n.psf.gz +%{console_fontdir}/ter-k28b.psf.gz +%{console_fontdir}/ter-k28n.psf.gz +%{console_fontdir}/ter-k32b.psf.gz +%{console_fontdir}/ter-k32n.psf.gz +%{console_fontdir}/ter-m12n.psf.gz +%{console_fontdir}/ter-m14b.psf.gz +%{console_fontdir}/ter-m14n.psf.gz +%{console_fontdir}/ter-m16b.psf.gz +%{console_fontdir}/ter-m16n.psf.gz +%{console_fontdir}/ter-m18b.psf.gz +%{console_fontdir}/ter-m18n.psf.gz +%{console_fontdir}/ter-m20b.psf.gz +%{console_fontdir}/ter-m20n.psf.gz +%{console_fontdir}/ter-m22b.psf.gz +%{console_fontdir}/ter-m22n.psf.gz +%{console_fontdir}/ter-m24b.psf.gz +%{console_fontdir}/ter-m24n.psf.gz +%{console_fontdir}/ter-m28b.psf.gz +%{console_fontdir}/ter-m28n.psf.gz +%{console_fontdir}/ter-m32b.psf.gz +%{console_fontdir}/ter-m32n.psf.gz +%{console_fontdir}/ter-p12n.psf.gz +%{console_fontdir}/ter-p14b.psf.gz +%{console_fontdir}/ter-p14n.psf.gz +%{console_fontdir}/ter-p16b.psf.gz +%{console_fontdir}/ter-p16n.psf.gz +%{console_fontdir}/ter-p18b.psf.gz +%{console_fontdir}/ter-p18n.psf.gz +%{console_fontdir}/ter-p20b.psf.gz +%{console_fontdir}/ter-p20n.psf.gz +%{console_fontdir}/ter-p22b.psf.gz +%{console_fontdir}/ter-p22n.psf.gz +%{console_fontdir}/ter-p24b.psf.gz +%{console_fontdir}/ter-p24n.psf.gz +%{console_fontdir}/ter-p28b.psf.gz +%{console_fontdir}/ter-p28n.psf.gz +%{console_fontdir}/ter-p32b.psf.gz +%{console_fontdir}/ter-p32n.psf.gz +%{console_fontdir}/ter-u12n.psf.gz +%{console_fontdir}/ter-u14b.psf.gz +%{console_fontdir}/ter-u14n.psf.gz +%{console_fontdir}/ter-u16b.psf.gz +%{console_fontdir}/ter-u16n.psf.gz +%{console_fontdir}/ter-u18b.psf.gz +%{console_fontdir}/ter-u18n.psf.gz +%{console_fontdir}/ter-u20b.psf.gz +%{console_fontdir}/ter-u20n.psf.gz +%{console_fontdir}/ter-u22b.psf.gz +%{console_fontdir}/ter-u22n.psf.gz +%{console_fontdir}/ter-u24b.psf.gz +%{console_fontdir}/ter-u24n.psf.gz +%{console_fontdir}/ter-u28b.psf.gz +%{console_fontdir}/ter-u28n.psf.gz +%{console_fontdir}/ter-u32b.psf.gz +%{console_fontdir}/ter-u32n.psf.gz +%{console_fontdir}/ter-v12n.psf.gz +%{console_fontdir}/ter-v14b.psf.gz +%{console_fontdir}/ter-v14n.psf.gz +%{console_fontdir}/ter-v16b.psf.gz +%{console_fontdir}/ter-v16n.psf.gz +%{console_fontdir}/ter-v18b.psf.gz +%{console_fontdir}/ter-v18n.psf.gz +%{console_fontdir}/ter-v20b.psf.gz +%{console_fontdir}/ter-v20n.psf.gz +%{console_fontdir}/ter-v22b.psf.gz +%{console_fontdir}/ter-v22n.psf.gz +%{console_fontdir}/ter-v24b.psf.gz +%{console_fontdir}/ter-v24n.psf.gz +%{console_fontdir}/ter-v28b.psf.gz +%{console_fontdir}/ter-v28n.psf.gz +%{console_fontdir}/ter-v32b.psf.gz +%{console_fontdir}/ter-v32n.psf.gz %ifnarch %{grub2_exclude_arches} %files grub2 -%doc README README-BG -%{grub2fontdir}/ter-u12b.pf2 -%{grub2fontdir}/ter-u12n.pf2 -%{grub2fontdir}/ter-u14b.pf2 -%{grub2fontdir}/ter-u14n.pf2 -%{grub2fontdir}/ter-u16b.pf2 -%{grub2fontdir}/ter-u16n.pf2 -%{grub2fontdir}/ter-u18b.pf2 -%{grub2fontdir}/ter-u18n.pf2 -%{grub2fontdir}/ter-u20b.pf2 -%{grub2fontdir}/ter-u20n.pf2 -%{grub2fontdir}/ter-u22b.pf2 -%{grub2fontdir}/ter-u22n.pf2 -%{grub2fontdir}/ter-u24b.pf2 -%{grub2fontdir}/ter-u24n.pf2 -%{grub2fontdir}/ter-u28b.pf2 -%{grub2fontdir}/ter-u28n.pf2 -%{grub2fontdir}/ter-u32b.pf2 -%{grub2fontdir}/ter-u32n.pf2 +%doc README +%doc README-BG +%{grub2_fontdir}/ter-u12b.pf2 +%{grub2_fontdir}/ter-u12n.pf2 +%{grub2_fontdir}/ter-u14b.pf2 +%{grub2_fontdir}/ter-u14n.pf2 +%{grub2_fontdir}/ter-u16b.pf2 +%{grub2_fontdir}/ter-u16n.pf2 +%{grub2_fontdir}/ter-u18b.pf2 +%{grub2_fontdir}/ter-u18n.pf2 +%{grub2_fontdir}/ter-u20b.pf2 +%{grub2_fontdir}/ter-u20n.pf2 +%{grub2_fontdir}/ter-u22b.pf2 +%{grub2_fontdir}/ter-u22n.pf2 +%{grub2_fontdir}/ter-u24b.pf2 +%{grub2_fontdir}/ter-u24n.pf2 +%{grub2_fontdir}/ter-u28b.pf2 +%{grub2_fontdir}/ter-u28n.pf2 +%{grub2_fontdir}/ter-u32b.pf2 +%{grub2_fontdir}/ter-u32n.pf2 %endif %changelog +* Sat Apr 25 2020 Hans Ulrich Niedermann - 4.48-6 +- complete spec file rewrite based on spectemplate-fonts-1-full.spec +- split off legacy PCF files into -legacy-x11 subpackage + * Tue Apr 7 2020 Hans Ulrich Niedermann - 4.48-5 - List *.otb files explicitly (without wildcards) - Updated package descriptions and spec comments for more accuracy From 83e17c4376cc35e98f97f6bac8f7b02f173e2536 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 2 Jun 2020 20:40:07 +0900 Subject: [PATCH 02/38] Workaround wrong weight in Terminus.otb in fontconfig config file. Resolves: rhbz#1823637 --- 63-terminus-fonts.conf | 16 ++++++++++++++++ terminus-fonts.spec | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/63-terminus-fonts.conf b/63-terminus-fonts.conf index 1f6afa5..b97e998 100644 --- a/63-terminus-fonts.conf +++ b/63-terminus-fonts.conf @@ -1,6 +1,22 @@ + + + + Terminus + + + Regular + + + medium + + + regular + + + monospace diff --git a/terminus-fonts.spec b/terminus-fonts.spec index db47919..aabd5cd 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.48 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -779,6 +779,10 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Tue Jun 2 2020 Akira TAGOH - 4.48-7 +- Workaround wrong weight in Terminus.otb in fontconfig config file. + Resolves: rhbz#1823637 + * Sat Apr 25 2020 Hans Ulrich Niedermann - 4.48-6 - complete spec file rewrite based on spectemplate-fonts-1-full.spec - split off legacy PCF files into -legacy-x11 subpackage From f098d11e0ae5dd5b480f87bc3859567afc221458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:18:04 +0000 Subject: [PATCH 03/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- terminus-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index aabd5cd..b7ce9d9 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.48 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -779,6 +779,9 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.48-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 2 2020 Akira TAGOH - 4.48-7 - Workaround wrong weight in Terminus.otb in fontconfig config file. Resolves: rhbz#1823637 From 7e0ed54d05d54c44bce8936a96574ca30c01990a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:26:39 +0000 Subject: [PATCH 04/38] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- terminus-fonts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index b7ce9d9..0537aa1 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -107,6 +107,7 @@ Source24: %{name}-README.fedora # For generating *.otb (OpenType bitmap font) files Source42: bitmapfonts2otb.py Patch42: %{name}-opentype-bitmap-via-fonttosfnt.patch +BuildRequires: make BuildRequires: /usr/bin/ftdump BuildRequires: /usr/bin/fonttosfnt BuildRequires: python3 > 3.5.0 From b9bc5a648c4eb38cbeaabcfa3909a38f1104efa4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:47:12 +0000 Subject: [PATCH 05/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- terminus-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 0537aa1..1b073e0 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.48 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -780,6 +780,9 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.48-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.48-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b1f2f2bfcdf8c0da6d7b9559190a9a8529a64371 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:26:39 +0000 Subject: [PATCH 06/38] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- terminus-fonts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index b7ce9d9..0537aa1 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -107,6 +107,7 @@ Source24: %{name}-README.fedora # For generating *.otb (OpenType bitmap font) files Source42: bitmapfonts2otb.py Patch42: %{name}-opentype-bitmap-via-fonttosfnt.patch +BuildRequires: make BuildRequires: /usr/bin/ftdump BuildRequires: /usr/bin/fonttosfnt BuildRequires: python3 > 3.5.0 From ce187409a39a2fc700af0e481f50e3decfa04844 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 29 Dec 2020 10:55:38 +0800 Subject: [PATCH 07/38] Add BuildRequires: fonttosfnt >= 1.2.1 fonttosfnt 1.2.1 appears to fix the weight property issue we had to work around in the fontconfig file. Closes: https://src.fedoraproject.org/rpms/terminus-fonts/pull-request/3 --- 63-terminus-fonts.conf | 16 ---------------- terminus-fonts.spec | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/63-terminus-fonts.conf b/63-terminus-fonts.conf index b97e998..1f6afa5 100644 --- a/63-terminus-fonts.conf +++ b/63-terminus-fonts.conf @@ -1,22 +1,6 @@ - - - - Terminus - - - Regular - - - medium - - - regular - - - monospace diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 0537aa1..5c82151 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -109,7 +109,7 @@ Source42: bitmapfonts2otb.py Patch42: %{name}-opentype-bitmap-via-fonttosfnt.patch BuildRequires: make BuildRequires: /usr/bin/ftdump -BuildRequires: /usr/bin/fonttosfnt +BuildRequires: fonttosfnt >= 1.2.1 BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) From c390edf3f4930b36f0e79cd39c7d28357394ea59 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 29 Jan 2021 22:11:33 +0100 Subject: [PATCH 08/38] 4.48-10 Remove font weight workaround Remove the font weight workaround for fonttosfnt < 1.2.1 according to the pull request by Peng Wu: https://src.fedoraproject.org/rpms/terminus-fonts/pull-request/3 --- terminus-fonts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 5b08d70..e9cd6ab 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.48 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -780,6 +780,11 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Fri Jan 29 2021 Hans Ulrich Niedermann - 4.48-10 +- Add BuildRequires: make +- Add BuildRequires: fonttosfnt >= 1.2.1 (remove font weight workaround) + Closes: https://src.fedoraproject.org/rpms/terminus-fonts/pull-request/3 + * Wed Jan 27 2021 Fedora Release Engineering - 4.48-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3ce53cf205d18b36256e531d32240a35a8dc3465 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 1 Feb 2021 07:39:55 +0100 Subject: [PATCH 09/38] Add generate-font-card script generating a font overview card --- font-card.txt | 4 ++ generate-font-card | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 font-card.txt create mode 100755 generate-font-card diff --git a/font-card.txt b/font-card.txt new file mode 100644 index 0000000..65acf7d --- /dev/null +++ b/font-card.txt @@ -0,0 +1,4 @@ +This is some very normal text for pango to +render so that we can see whether the bitmap +font has been properly converted to the +*.otb Opentype bitmap font file format. diff --git a/generate-font-card b/generate-font-card new file mode 100755 index 0000000..78e0423 --- /dev/null +++ b/generate-font-card @@ -0,0 +1,99 @@ +#!/bin/bash +# +# Render each and every font weight and size of the Terminus font to a +# single PNG file to allow one at a glance checking that the font has +# been converted correctly. +# +# Requirements: +# * pango-view to render text to bitmaps +# * ImageMagick (for identify and montage) + +set -e + +scriptdir="$(cd "$(dirname "$0")" && pwd)" +imgbaseroot="terminus-font-card" + +# Default values +default_identify="/usr/bin/identify" +default_montage="/usr/bin/montage" +default_pv="/usr/bin/pango-view" +default_text_file="${scriptdir}/font-card.txt" + +# Unless set explictly, use default value +MONTAGE="${MONTAGE:=${default_montage}}" +IDENTIFY="${IDENTIFY:=${default_identify}}" +PV="${PV:=${default_pv}}" +TEXTFILE="${TEXTFILE:=${default_text_file}}" + +print_args() { + echo "Argument list:" + for arg + do + echo " * <<${arg}>>" + done +} + +run() { + local fontname="${1:?No fontname given}" + local fontsize="${2:?No fontsize given}" + local image_fname="${3:?No image_fname given}" + + local PV_CMD=(${PV}) + + # PV_CMD+=("--annotate=1") + # PV_CMD+=("--annotate=2") + # PV_CMD+=("--annotate=3") + + PV_CMD+=("--no-display") + # PV_CMD+=("--single-par") + PV_CMD+=("--language=C") + # PV_CMD+=("--pixels") + PV_CMD+=("--font=${fontname} ${fontsize}") + + PV_CMD+=("${TEXTFILE}") + + PV_CMD+=("--output=${image_fname}") + IMAGE_LIST+=("${image_fname}") + + print_args "${PV_CMD[@]}" + "${PV_CMD[@]}" + + file "${image_fname}" +} + + +width=480 +height=120 + +MONTAGE_CMD=(${MONTAGE}) +IMAGE_LIST=() +FONT_SIZES=(12 14 16 18 20 22 24 28 32) +FONT_NAMES=("Terminus Medium" "Terminus Bold") +FONT_NAMES=("Terminus" "Terminus Bold") +for fontsize in "${FONT_SIZES[@]}" +do + for fontname in "${FONT_NAMES[@]}" + do + image_fname="${scriptdir}/${imgbaseroot}--${fontname}-${fontsize}.png" + run "$fontname" "$fontsize" "$image_fname" + MONTAGE_CMD+=(-label "${fontname} ${fontsize} ($(${IDENTIFY} -format "%[fx:w]x%[fx:h]" "${image_fname}"))") + MONTAGE_CMD+=("$image_fname") + MONTAGE_CMD+=(-repage "${width}x${height}>") + MONTAGE_CMD+=(-crop "${width}x${height}>") + done +done + +echo "Images: ${IMAGE_LIST[@]}" + +montage_fname="${scriptdir}/${imgbaseroot}.png" +MONTAGE_CMD+=(-tile "${#FONT_NAMES[@]}x${#FONT_SIZES[@]}") +MONTAGE_CMD+=(-frame 5) +MONTAGE_CMD+=(-geometry "${width}x${height}<+2+2>") +MONTAGE_CMD+=(${montage_fname}) + +print_args "${MONTAGE_CMD[@]}" +"${MONTAGE_CMD[@]}" + +file "$montage_fname" + +# End of file. From 33e4429bdda689cad87e9307a72173147f391f57 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 1 Feb 2021 21:31:40 +0100 Subject: [PATCH 10/38] Add box drawing and block element characters to font card The box drawing and block elements should help determine whether the horizontal and vertical spacing between letters are correct. --- font-card.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/font-card.txt b/font-card.txt index 65acf7d..3ced8a6 100644 --- a/font-card.txt +++ b/font-card.txt @@ -1,4 +1,4 @@ -This is some very normal text for pango to -render so that we can see whether the bitmap -font has been properly converted to the -*.otb Opentype bitmap font file format. +█ This is some ╔═╕ very normal text for pango to + █▀▄ render so ╟┬┤ that we can see whether the bitmap + font has been ╠╪╡ font has been properly converted to the +*.otb OpenType ╚╧╛ bitmap font file format. From 78538f2a4a038b0d837875aaef0c3d608f4f9e09 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 3 Feb 2021 16:44:13 +0100 Subject: [PATCH 11/38] More block characters for font card to help with spacing --- font-card.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/font-card.txt b/font-card.txt index 3ced8a6..3d250bc 100644 --- a/font-card.txt +++ b/font-card.txt @@ -1,4 +1,4 @@ -█ This is some ╔═╕ very normal text for pango to - █▀▄ render so ╟┬┤ that we can see whether the bitmap - font has been ╠╪╡ font has been properly converted to the -*.otb OpenType ╚╧╛ bitmap font file format. +▌▗▖█ This is some ╔═╕ text for pango to render so +▐▝▘ █▀▄ ▒ that we ╟┬┤ can see whether the bitmap + font has been ╠╪╡ properly converted to the + *.otb OpenType ╚╧╛ bitmap font file format. From 4faaf5e1be605c3c2c7a4599f0824f1d1e0cdcf0 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 3 Feb 2021 17:44:05 +0100 Subject: [PATCH 12/38] 4.48-10.1 ship one otb file per font size Shipping one otb file per font size preserves the font metrics so that character spacing can work both vertically and horizontally. This uses Peng Wu's updated conversion script. --- bitmapfonts2otb.py | 43 +++++++++++-------- ...fonts-opentype-bitmap-via-fonttosfnt.patch | 2 +- terminus-fonts.spec | 9 +++- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/bitmapfonts2otb.py b/bitmapfonts2otb.py index f98860a..aa2642b 100644 --- a/bitmapfonts2otb.py +++ b/bitmapfonts2otb.py @@ -1,62 +1,71 @@ #!/usr/bin/python3 +# This script is licensed under the GPL-3.0-or-later license. + # Automatically group the font files by family names and style names, # and assume each bitmap font only contains one font face. -# -# Generates one otb file per (family name, style name) tuple, named -# after the tuple. -# # This tool requires ftdump and fonttosfnt. +# Some changes by Hans Ulrich Niedermann and Antonio Larrosa. + # Written by Peng Wu as -# https://pwu.fedorapeople.org/fonts/convertbitmap/convertfont.py +# https://pwu.fedorapeople.org/fonts/convertbitmap/convertfont2.py # Some changes by Hans Ulrich Niedermann. +import re import sys import subprocess usage = ''' -bitmapfonts2otb.py [BITMAPFONTFILE]... +convertfont2.py [BITMAPFONTFILE]... ''' fontnames = dict() # get font family name and style name by ftdump -def getfullname(fontname): +def get_fullname_height(fontname): output = subprocess.check_output(['ftdump', fontname]) output = output.decode('utf8') # only contain one font face assert not 'Face number: 1' in output result = {} + height = 0 for row in output.split('\n'): + # for family name and style name if ':' in row: key, value = row.split(': ') result[key.strip()] = value.strip() + # for height + if 'height' in row: + match = re.search('height (\d+)', row) + height = int(match.group(1)) + assert height > 0 familyname, stylename = result['family'], result['style'] if stylename == 'Regular': - return familyname + return (familyname, height) else: - return familyname + ' ' + stylename + return (familyname + ' ' + stylename, height) def generate_fonts(): - for fullname, filenames in fontnames.items(): - outputfilename = fullname.replace(' ', '-') + '.otb' - argv = ['fonttosfnt', '-b', '-c', '-g', '2', '-m', '2', '-o', outputfilename ] + for (fullname, height), filenames in fontnames.items(): + outputfilename = fullname.replace(' ', '-') + '-' + str(height) + '.otb' + argv = 'fonttosfnt -b -c -g 2 -m 2 -o'.split(' ') + argv.append(outputfilename) argv.extend(filenames) - print(outputfilename) print(' '.join(argv)) print(subprocess.check_output(argv).decode('utf8')) if __name__ == '__main__': for bitmapfontname in sys.argv[1:]: - fullname = getfullname(bitmapfontname) - if fullname in fontnames: - fontnames[fullname].append(bitmapfontname) + (fullname, height) = get_fullname_height(bitmapfontname) + index = (fullname, height) + if index in fontnames: + fontnames[index].append(bitmapfontname) else: - fontnames[fullname] = [bitmapfontname] + fontnames[index] = [bitmapfontname] generate_fonts() diff --git a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch index 9cd8dc5..f9e2b06 100644 --- a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch +++ b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch @@ -25,7 +25,7 @@ Index: terminus-font-4.48/Makefile +# OpenType Bitmap fonts (OTB) + -+OTB = Terminus.otb Terminus-Bold.otb ++OTB = Terminus-12.otb Terminus-Bold-12.otb Terminus-14.otb Terminus-Bold-14.otb Terminus-16.otb Terminus-Bold-16.otb Terminus-18.otb Terminus-Bold-18.otb Terminus-20.otb Terminus-Bold-20.otb Terminus-22.otb Terminus-Bold-22.otb Terminus-24.otb Terminus-Bold-24.otb Terminus-28.otb Terminus-Bold-28.otb Terminus-32.otb Terminus-Bold-32.otb + +$(OTB): $(BDF) + $(BDF2OTB) $(BDF) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index e9cd6ab..1164720 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.48 -Release: 10%{?dist} +Release: 10%{?dist}.1 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -31,7 +31,7 @@ URL: http://terminus-font.sourceforge.net/ # # More shell glob lists: # – font family files -%global fonts Terminus.otb Terminus-Bold.otb +%global fonts Terminus*.otb # – exclusions from the “fonts” list) %global fontsex %{nil} # – fontconfig files @@ -177,6 +177,8 @@ iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG --x11dir=%{legacy_x11_fontdir} --psfdir=%{console_fontdir} env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw otb +ls -l *.otb + %ifnarch %{grub2_exclude_arches} # generate *.pf2 for the grub2 bootloader for bdf in ter-*[bn].bdf; do @@ -780,6 +782,9 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.48-10.1 +- Update otb conversion script and ship one *.otb file per font size + * Fri Jan 29 2021 Hans Ulrich Niedermann - 4.48-10 - Add BuildRequires: make - Add BuildRequires: fonttosfnt >= 1.2.1 (remove font weight workaround) From 3606a87aa82a2e4510097480af6ba73caa8ddc71 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 3 Feb 2021 19:34:33 +0100 Subject: [PATCH 13/38] 4.49.1-10.2: Update to terminus-font-4.49.1, keeping fonttosfnt *.otb generation Update to upstream's terminus-font-4.49-1 release, but keep using our own fonttosfnt based generation of *.otb OpenType bitmap font files. --- .gitignore | 2 + sources | 2 +- ...fonts-opentype-bitmap-via-fonttosfnt.patch | 61 +++++++++---------- terminus-fonts.spec | 9 ++- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 33bc0b7..9c25677 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ terminus-font-4.30-ij1.diff.gz /terminus-font-4.46.tar.gz /terminus-font-4.47.tar.gz /terminus-font-4.48.tar.gz +/terminus-font-4.49.tar.gz +/terminus-font-4.49.1.tar.gz diff --git a/sources b/sources index 3851aad..7abed12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (terminus-font-4.48.tar.gz) = 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4 +SHA512 (terminus-font-4.49.1.tar.gz) = 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8 diff --git a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch index f9e2b06..e7a266f 100644 --- a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch +++ b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch @@ -1,57 +1,54 @@ -Index: terminus-font-4.48/Makefile -=================================================================== ---- terminus-font-4.48.orig/Makefile -+++ terminus-font-4.48/Makefile +diff -ruN terminus-font-4.49.1-orig/Makefile terminus-font-4.49.1-fedora/Makefile +--- terminus-font-4.49.1-orig/Makefile 2020-12-28 19:15:40.000000000 +0100 ++++ terminus-font-4.49.1-fedora/Makefile 2021-02-03 19:42:10.830822514 +0100 @@ -1,3 +1,4 @@ +INSTALL = install INT = python3 EXT = py BIN = ./bin -@@ -5,8 +6,11 @@ BIN = ./bin - UCS2ANY = $(INT) $(BIN)/ucstoany.$(EXT) - BDF2PSF = $(INT) $(BIN)/bdftopsf.$(EXT) - UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f -+BDF2OTB = $(INT) $(BIN)/bitmapfonts2otb.$(EXT) - BDF2PCF = bdftopcf +@@ -8,6 +9,7 @@ + BDF2PCF = bdftopcf + #BDF2OTB = fontforge -lang=ff -c 'Open($$3); ScaleToEm(1024); Generate($$2)' + BDF2OTB = $(INT) $(BIN)/otb1cli.$(EXT) ++FONTTOSFNT_BDF2OTB = $(INT) $(BIN)/bitmapfonts2otb.$(EXT) -+BDF = ter-u12b.bdf ter-u14v.bdf ter-u18b.bdf ter-u22b.bdf ter-u28b.bdf ter-u12n.bdf ter-u16b.bdf ter-u18n.bdf ter-u22n.bdf ter-u28n.bdf ter-u14b.bdf ter-u16n.bdf ter-u20b.bdf ter-u24b.bdf ter-u32b.bdf ter-u14n.bdf ter-u16v.bdf ter-u20n.bdf ter-u24n.bdf ter-u32n.bdf -+ REG_8859_1 = ISO8859 1 REG_8859_2 = ISO8859 2 - REG_8859_5 = ISO8859 5 -@@ -211,6 +215,27 @@ install-psf-ref: README +@@ -216,6 +218,29 @@ uninstall-psf-ref: rm -f $(DESTDIR)$(psfref) -+# OpenType Bitmap fonts (OTB) ++# fonttosfnt generated OpenType Bitmap fonts (OTB) + -+OTB = Terminus-12.otb Terminus-Bold-12.otb Terminus-14.otb Terminus-Bold-14.otb Terminus-16.otb Terminus-Bold-16.otb Terminus-18.otb Terminus-Bold-18.otb Terminus-20.otb Terminus-Bold-20.otb Terminus-22.otb Terminus-Bold-22.otb Terminus-24.otb Terminus-Bold-24.otb Terminus-28.otb Terminus-Bold-28.otb Terminus-32.otb Terminus-Bold-32.otb ++FONTTOSFNT_BDF = ter-u12b.bdf ter-u14v.bdf ter-u18b.bdf ter-u22b.bdf ter-u28b.bdf ter-u12n.bdf ter-u16b.bdf ter-u18n.bdf ter-u22n.bdf ter-u28n.bdf ter-u14b.bdf ter-u16n.bdf ter-u20b.bdf ter-u24b.bdf ter-u32b.bdf ter-u14n.bdf ter-u16v.bdf ter-u20n.bdf ter-u24n.bdf ter-u32n.bdf + -+$(OTB): $(BDF) -+ $(BDF2OTB) $(BDF) ++FONTTOSFNT_OTB = Terminus-12.otb Terminus-Bold-12.otb Terminus-14.otb Terminus-Bold-14.otb Terminus-16.otb Terminus-Bold-16.otb Terminus-18.otb Terminus-Bold-18.otb Terminus-20.otb Terminus-Bold-20.otb Terminus-22.otb Terminus-Bold-22.otb Terminus-24.otb Terminus-Bold-24.otb Terminus-28.otb Terminus-Bold-28.otb Terminus-32.otb Terminus-Bold-32.otb + -+.PHONY: otb -+otb: $(OTB) ++$(FONTTOSFNT_OTB): $(FONTOSFNT_BDF) ++ $(FONTTOSFNT_BDF2OTB) $(FONTTOSFNT_BDF) + -+otbdir = $(x11dir) ++.PHONY: fonttosfnt-otb ++fonttosfnt-otb: $(FONTTOSFNT_OTB) + -+.PHONY: install-otb -+install-otb: $(OTB) -+ $(INSTALL) -m 0755 -d "$(DESTDIR)$(otbdir)" -+ $(INSTALL) -m 0644 -t "$(DESTDIR)$(otbdir)" $(OTB) ++fonttosfnt_otbdir = $(x11dir) + -+.PHONY: uninstall-otb -+uninstall-otb: -+ @set -x; if test -d "$(DESTDIR)$(otbdir)"; then cd "$(DESTDIR)$(otbdir)" && rm -f $(OTB); fi ++.PHONY: install-fonttosfnt-otb ++install-fonttosfnt-otb: $(OTB) ++ $(INSTALL) -m 0755 -d "$(DESTDIR)$(fonttosfnt_otbdir)" ++ $(INSTALL) -m 0644 -t "$(DESTDIR)$(fonttosfnt_otbdir)" $(FONTTOSFNT_OTB) ++ ++.PHONY: uninstall-fonttosfnt-otb ++uninstall-fonttosfnt-otb: ++ @set -x; if test -d "$(DESTDIR)$(fonttosfnt_otbdir)"; then cd "$(DESTDIR)$(fonttosfnt_otbdir)" && rm -f $(FONTTOSFNT_OTB); fi + # X11 Window System X11_8859_1 = uni/x11gr.uni uni/ascii-h.uni uni/win-1252.uni -@@ -291,6 +316,6 @@ uninstall-pcf-8bit: +@@ -310,6 +335,6 @@ # Cleanup clean: -- rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(FNT) -+ rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(FNT) $(OTB) +- rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(OTB) ++ rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(OTB) $(FONTTOSFNT_OTB) - .PHONY: all install uninstall fontdir psf install-psf uninstall-psf psf-vgaw install-psf-vgaw uninstall-psf-vgaw install-psf-ref uninstall-psf-ref pcf install-pcf uninstall-pcf pcf-8bit install-pcf-8bit uninstall-pcf-8bit clean + .PHONY: all install uninstall fontdir psf install-psf uninstall-psf psf-vgaw install-psf-vgaw uninstall-psf-vgaw install-psf-ref uninstall-psf-ref pcf install-pcf uninstall-pcf pcf-8bit install-pcf-8bit uninstall-pcf-8bit otb install-otb uninstall-otb clean diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 1164720..84f4b27 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -2,8 +2,8 @@ # Top definitions from spectemplate-fonts-1-full.spec ######################################################################## -Version: 4.48 -Release: 10%{?dist}.1 +Version: 4.49.1 +Release: 10%{?dist}.2 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -175,7 +175,7 @@ iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG %build ./configure --prefix=%{_prefix} \ --x11dir=%{legacy_x11_fontdir} --psfdir=%{console_fontdir} -env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw otb +env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw fonttosfnt-otb ls -l *.otb @@ -782,6 +782,9 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.2 +- Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation + * Wed Feb 3 2021 Hans Ulrich Niedermann - 4.48-10.1 - Update otb conversion script and ship one *.otb file per font size From 7b804df77c21c46e02cf1d3bf98dcd530e519ad5 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 3 Feb 2021 20:40:24 +0100 Subject: [PATCH 14/38] 4.49.1-10.3: Switch to upstream method of building *.otb Switch to using upstream's way of building *.otb OpenType bitmap font files instead of our former fonttosfnt based one. --- ...fonts-opentype-bitmap-via-fonttosfnt.patch | 54 ------------------- terminus-fonts.spec | 12 ++--- 2 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 terminus-fonts-opentype-bitmap-via-fonttosfnt.patch diff --git a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch b/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch deleted file mode 100644 index e7a266f..0000000 --- a/terminus-fonts-opentype-bitmap-via-fonttosfnt.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ruN terminus-font-4.49.1-orig/Makefile terminus-font-4.49.1-fedora/Makefile ---- terminus-font-4.49.1-orig/Makefile 2020-12-28 19:15:40.000000000 +0100 -+++ terminus-font-4.49.1-fedora/Makefile 2021-02-03 19:42:10.830822514 +0100 -@@ -1,3 +1,4 @@ -+INSTALL = install - INT = python3 - EXT = py - BIN = ./bin -@@ -8,6 +9,7 @@ - BDF2PCF = bdftopcf - #BDF2OTB = fontforge -lang=ff -c 'Open($$3); ScaleToEm(1024); Generate($$2)' - BDF2OTB = $(INT) $(BIN)/otb1cli.$(EXT) -+FONTTOSFNT_BDF2OTB = $(INT) $(BIN)/bitmapfonts2otb.$(EXT) - - REG_8859_1 = ISO8859 1 - REG_8859_2 = ISO8859 2 -@@ -216,6 +218,29 @@ - uninstall-psf-ref: - rm -f $(DESTDIR)$(psfref) - -+# fonttosfnt generated OpenType Bitmap fonts (OTB) -+ -+FONTTOSFNT_BDF = ter-u12b.bdf ter-u14v.bdf ter-u18b.bdf ter-u22b.bdf ter-u28b.bdf ter-u12n.bdf ter-u16b.bdf ter-u18n.bdf ter-u22n.bdf ter-u28n.bdf ter-u14b.bdf ter-u16n.bdf ter-u20b.bdf ter-u24b.bdf ter-u32b.bdf ter-u14n.bdf ter-u16v.bdf ter-u20n.bdf ter-u24n.bdf ter-u32n.bdf -+ -+FONTTOSFNT_OTB = Terminus-12.otb Terminus-Bold-12.otb Terminus-14.otb Terminus-Bold-14.otb Terminus-16.otb Terminus-Bold-16.otb Terminus-18.otb Terminus-Bold-18.otb Terminus-20.otb Terminus-Bold-20.otb Terminus-22.otb Terminus-Bold-22.otb Terminus-24.otb Terminus-Bold-24.otb Terminus-28.otb Terminus-Bold-28.otb Terminus-32.otb Terminus-Bold-32.otb -+ -+$(FONTTOSFNT_OTB): $(FONTOSFNT_BDF) -+ $(FONTTOSFNT_BDF2OTB) $(FONTTOSFNT_BDF) -+ -+.PHONY: fonttosfnt-otb -+fonttosfnt-otb: $(FONTTOSFNT_OTB) -+ -+fonttosfnt_otbdir = $(x11dir) -+ -+.PHONY: install-fonttosfnt-otb -+install-fonttosfnt-otb: $(OTB) -+ $(INSTALL) -m 0755 -d "$(DESTDIR)$(fonttosfnt_otbdir)" -+ $(INSTALL) -m 0644 -t "$(DESTDIR)$(fonttosfnt_otbdir)" $(FONTTOSFNT_OTB) -+ -+.PHONY: uninstall-fonttosfnt-otb -+uninstall-fonttosfnt-otb: -+ @set -x; if test -d "$(DESTDIR)$(fonttosfnt_otbdir)"; then cd "$(DESTDIR)$(fonttosfnt_otbdir)" && rm -f $(FONTTOSFNT_OTB); fi -+ - # X11 Window System - - X11_8859_1 = uni/x11gr.uni uni/ascii-h.uni uni/win-1252.uni -@@ -310,6 +335,6 @@ - # Cleanup - - clean: -- rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(OTB) -+ rm -f $(PSF) $(PSF_VGAW) $(PCF) $(PCF_8BIT) $(OTB) $(FONTTOSFNT_OTB) - - .PHONY: all install uninstall fontdir psf install-psf uninstall-psf psf-vgaw install-psf-vgaw uninstall-psf-vgaw install-psf-ref uninstall-psf-ref pcf install-pcf uninstall-pcf pcf-8bit install-pcf-8bit uninstall-pcf-8bit otb install-otb uninstall-otb clean diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 84f4b27..f882214 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 10%{?dist}.2 +Release: 10%{?dist}.3 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -31,7 +31,7 @@ URL: http://terminus-font.sourceforge.net/ # # More shell glob lists: # – font family files -%global fonts Terminus*.otb +%global fonts ter-*.otb # – exclusions from the “fonts” list) %global fontsex %{nil} # – fontconfig files @@ -106,10 +106,8 @@ Source24: %{name}-README.fedora # For generating *.otb (OpenType bitmap font) files Source42: bitmapfonts2otb.py -Patch42: %{name}-opentype-bitmap-via-fonttosfnt.patch BuildRequires: make BuildRequires: /usr/bin/ftdump -BuildRequires: fonttosfnt >= 1.2.1 BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) @@ -166,7 +164,6 @@ relying on legacy PCF font rendering methods (e.g. GNU Emacs 26). # -n do not recode files, only adjust folding and end of lines #linuxtext *.txt cp -p "%{SOURCE42}" bin/ -%patch42 -p1 -b .opentype-bitmap-via-fonttosfnt patch -s -p1 -b --suffix .dv1 -fuzz=0 -i alt/dv1.diff patch -s -p1 -b --suffix .ij1 -fuzz=0 -i alt/ij1.diff iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG @@ -175,7 +172,7 @@ iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG %build ./configure --prefix=%{_prefix} \ --x11dir=%{legacy_x11_fontdir} --psfdir=%{console_fontdir} -env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw fonttosfnt-otb +env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf psf-vgaw otb ls -l *.otb @@ -782,6 +779,9 @@ ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled %changelog +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.3 +- Use upstream's way of building *.otb OpenType bitmap font files + * Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.2 - Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation From 5e549a3f25fc30ea9b9010a877f4a585f3fd6741 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 5 Feb 2021 17:35:48 +0100 Subject: [PATCH 15/38] Add some checks on the wildcard font file names The font package macros want font file names %{fonts} as wildcards, which loses us the explicit changes to the file list. So this adds at least a few consistency checks: * abort the build if a wild card does not match * abort the build if the number of font files is out of bounds (right now: must be exactly 18 to build) --- terminus-fonts.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index f882214..3b667f4 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -207,6 +207,25 @@ install -m 0755 -d %{buildroot}%{catalog} ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled /usr/bin/mkfontdir %{buildroot}%{legacy_x11_fontdir} +# Check automatic fonts do not contain unmatched wildcards +font_counter=0 +for fntfile in %{fonts} +do + if test -f "${fntfile}"; then + font_counter="$(expr "${font_counter}" + 1)" + else + echo "Missing font file or wildcard: ${fntfile}" + exit 2 + fi +done + +# Check automatic fonts are a potentially valid number of files +if test "$font_counter" -lt 18 || test "$font_counter" -gt 18 +then + echo "Weird number of font files: $font_counter" + exit 2 +fi + %fontinstall From af1759dff1328a2214ace5e401caad2b30a994f3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 5 Feb 2021 20:34:37 +0100 Subject: [PATCH 16/38] 4.49.1-11: new release Change summary for 4.49.1-11 release: * move from two to 18 *.otb font files * move from fonttosfnt to upstream's otb1cli.py * update to upstream release 4.49.1 * resolves: #1910955, #1922893 --- terminus-fonts.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 3b667f4..e492161 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 10%{?dist}.3 +Release: 11%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -798,11 +798,14 @@ fi %changelog +* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-11 +- Add checks on wildcard names matching font files + * Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.3 -- Use upstream's way of building *.otb OpenType bitmap font files +- Use upstream's way of building *.otb OpenType bitmap font files (#1922893) * Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.2 -- Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation +- Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation (#1910955) * Wed Feb 3 2021 Hans Ulrich Niedermann - 4.48-10.1 - Update otb conversion script and ship one *.otb file per font size From 911b97174f08941c1e6869c3e52d88fb710e1583 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 6 Feb 2021 00:11:51 +0100 Subject: [PATCH 17/38] 4.49.1-12: Move consolefonts from /lib to /usr/lib Move consolefonts from /lib to /usr/lib like kbd has done (#1925696). --- terminus-fonts.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index e492161..c68ad6b 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -64,9 +64,14 @@ plus CRT VGA-bold for 8x14 and 8x16. # The basename for upstream's source tarball %global archivename terminus-font-%{version} -# 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 +# 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 # The ExcludeArch from the grub2.spec file # @@ -124,6 +129,7 @@ BuildRequires: /usr/bin/grub2-mkfont %package console Requires: kbd +Requires: %{kbddir} Summary: Clean fixed width font (console version) License: OFL @@ -798,6 +804,9 @@ fi %changelog +* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-12 +- Move consolefonts from /lib to /usr/lib like kbd has done (#1925696) + * Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-11 - Add checks on wildcard names matching font files From 6bfcce98594412abbd2ccc930ce2babb377d715d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:04:53 +0000 Subject: [PATCH 18/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- terminus-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index c68ad6b..8a992a8 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -804,6 +804,9 @@ fi %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.49.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-12 - Move consolefonts from /lib to /usr/lib like kbd has done (#1925696) From 36cfa91a8d48e24ec38602eb0d307bda5856e881 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:31:21 +0000 Subject: [PATCH 19/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- terminus-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 8a992a8..c942e67 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -804,6 +804,9 @@ fi %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.49.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.49.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0e0f02eb7c2e5825d682b752f275c5c4143d5ca8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:17:52 +0000 Subject: [PATCH 20/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- terminus-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index c942e67..7dc17f4 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -804,6 +804,9 @@ fi %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.49.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 4.49.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c0d6492ce553b7f1b185ac09438b8dc8ea37af95 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 18 Aug 2022 05:46:38 +0200 Subject: [PATCH 21/38] Convert to rpmautospec --- changelog | 198 +++++++++++++++++++++++++++++++++++++++++++ terminus-fonts.spec | 201 +------------------------------------------- 2 files changed, 200 insertions(+), 199 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8628a46 --- /dev/null +++ b/changelog @@ -0,0 +1,198 @@ +* Sat Jul 23 2022 Fedora Release Engineering - 4.49.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 4.49.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 4.49.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-12 +- Move consolefonts from /lib to /usr/lib like kbd has done (#1925696) + +* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-11 +- Add checks on wildcard names matching font files + +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.3 +- Use upstream's way of building *.otb OpenType bitmap font files (#1922893) + +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.2 +- Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation (#1910955) + +* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.48-10.1 +- Update otb conversion script and ship one *.otb file per font size + +* Fri Jan 29 2021 Hans Ulrich Niedermann - 4.48-10 +- Add BuildRequires: make +- Add BuildRequires: fonttosfnt >= 1.2.1 (remove font weight workaround) + Closes: https://src.fedoraproject.org/rpms/terminus-fonts/pull-request/3 + +* Wed Jan 27 2021 Fedora Release Engineering - 4.48-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.48-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 2 2020 Akira TAGOH - 4.48-7 +- Workaround wrong weight in Terminus.otb in fontconfig config file. + Resolves: rhbz#1823637 + +* Sat Apr 25 2020 Hans Ulrich Niedermann - 4.48-6 +- complete spec file rewrite based on spectemplate-fonts-1-full.spec +- split off legacy PCF files into -legacy-x11 subpackage + +* Tue Apr 7 2020 Hans Ulrich Niedermann - 4.48-5 +- List *.otb files explicitly (without wildcards) +- Updated package descriptions and spec comments for more accuracy + +* Wed Feb 5 2020 Peng Wu - 4.48-4 +- Use bitmapfonts2otb.py to combine bitmap fonts + +* Fri Jan 31 2020 Fedora Release Engineering - 4.48-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 3 2020 Hans Ulrich Niedermann - 4.48-2 +- Stop shipping VGA fonts in grub subpackage +- Build OTB fonts for compatibility with pango >= 1.44 (#1748495) + +* Tue Aug 27 2019 Hans Ulrich Niedermann - 4.48-1 +- Update to upstream release terminus-font-4.48 +- Ship the Hebrew characters introduced by terminus-font-4.48 + +* Sat Jul 27 2019 Fedora Release Engineering - 4.47-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 4.47-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jan 27 2019 Hans Ulrich Niedermann - 4.47-4 +- Only build -grub2 subpackage when arch/dist actually has grub2 +- Address and silence rpmlint warnings + +* Tue Jan 15 2019 Hans Ulrich Niedermann - 4.47-3 +- Update to upstream release terminus-font-4.47 + +* Tue Jan 15 2019 Hans Ulrich Niedermann - 4.46-3 +- Continue shipping the 8bit versions of *.pcf files (#1664054) + +* Tue Dec 18 2018 Hans Ulrich Niedermann - 4.46-2 +- Add grub2 subpackage with *.pf2 fonts + +* Tue Dec 18 2018 Hans Ulrich Niedermann - 4.46-1 +- Update to terminus-font-4.46 + +* Sat Jul 14 2018 Fedora Release Engineering - 4.40-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 4.40-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.40-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 4.40-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon May 16 2016 Hans Ulrich Niedermann - 4.40-5 +- Fix terminus-fonts-console README.fedora instructions on checking the initramfs. + +* Fri Feb 05 2016 Fedora Release Engineering - 4.40-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 18 2016 Hans Ulrich Niedermann - 4.40-3 +- Fix spelling issue in %%description +- iconv README-BG from WINDOWS-1251 to utf-8 + +* Sun Jan 17 2016 Hans Ulrich Niedermann - 4.40-2 +- Update to terminus-font-4.40 (#1095285) + +* Fri Jun 19 2015 Fedora Release Engineering - 4.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jul 10 2014 Jens Petersen - 4.39-1 +- update to 4.39 + +* Sun Jun 08 2014 Fedora Release Engineering - 4.38-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Nov 28 2013 Hans Ulrich Niedermann - 4.38-3 +- Improve instructions for F18+ to console README.fedora (#1000491) + +* Sat Nov 16 2013 Hans Ulrich Niedermann - 4.38-2 +- Add instructions for F18+ to terminus-fonts-console README.fedora (#1000491) + +* Mon Sep 16 2013 Parag - 4.38-1 +- Update to new 4.38 version + +* Sun Aug 04 2013 Fedora Release Engineering - 4.36-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 4.36-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 4.36-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 4.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Sep 12 2011 Hans Ulrich Niedermann - 4.36-1 +- Update to terminus-font-4.36 + +* Sat May 21 2011 Hans Ulrich Niedermann - 4.35-1 +- Update to terminus-font-4.35 +- Actually ship the size 18 fonts (upstream fix) + +* Mon May 2 2011 Hans Ulrich Niedermann - 4.34-1 +- Update to terminus-font-4.34 +- Remove patch for alt/ge1.diff (4.34 uses ge1 by default) + +* Wed Feb 09 2011 Fedora Release Engineering - 4.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Feb 1 2011 Hans Ulrich Niedermann - 4.32-1 +- Update to 4.32 + +* Fri Jul 16 2010 Hans Ulrich Niedermann - 4.30-2 +- Added License tag to -console subpackage. +- Added note about rebuilding initramfs after changing /etc/sysconfig/i18n. +- Changed URL, SourceN, PatchN to use new location at sourceforge.net. + +* Fri Dec 4 2009 Hans Ulrich Niedermann - 4.30-1 +- update to 4.30 release: + - new size 22 (not very good) + - 25 additional characters + - various small fixes + +* Sun Jul 26 2009 Fedora Release Engineering - 4.28-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 25 2009 Hans Ulrich Niedermann - 4.28-8 +- Rebuild for Fedora 11 to pick up font autodeps (#491973) + +* Wed Feb 25 2009 Fedora Release Engineering - 4.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Hans Ulrich Niedermann - 4.28-6 +- fix fontpackages-devel requirement to >= 1.18 (for _fontdir ownership) + +* Fri Feb 20 2009 Hans Ulrich Niedermann - 4.28-5 +- Add information to the fontconfig file +- no need to %%dir %%{_fontdir} in fontpackages-devel >= 1.20 +- Use %%{_sysconfdir} instead of /etc +- Change all %%define instances to %%global +- Drop filesystem requirement for F-10 and later +- Use macro for common parts of descriptions +- Remove unneeded Provides: +- drop unnecessary comment + +* Thu Feb 19 2009 Hans Ulrich Niedermann - 4.28-4 +- change catalog(ue) spelling to US English +- remove unnecessary macro definition of %%tarname +- properly define consolefontdir (no macros) + +* Thu Feb 19 2009 Hans Ulrich Niedermann - 4.28-3 +- generate fonts.dir at build time (bug 483589) + +* Wed Feb 18 2009 Hans Ulrich Niedermann - 4.28-2 +- initial package for new Fedora Font Policy diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 7dc17f4..18f7b1c 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: 15%{?dist} +Release: %autorelease URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} @@ -804,201 +804,4 @@ fi %changelog -* Sat Jul 23 2022 Fedora Release Engineering - 4.49.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 4.49.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.49.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-12 -- Move consolefonts from /lib to /usr/lib like kbd has done (#1925696) - -* Fri Feb 5 2021 Hans Ulrich Niedermann - 4.49.1-11 -- Add checks on wildcard names matching font files - -* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.3 -- Use upstream's way of building *.otb OpenType bitmap font files (#1922893) - -* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.49.1-10.2 -- Update to terminus-font-4.49.1, keeping our fonttosfnt *.otb generation (#1910955) - -* Wed Feb 3 2021 Hans Ulrich Niedermann - 4.48-10.1 -- Update otb conversion script and ship one *.otb file per font size - -* Fri Jan 29 2021 Hans Ulrich Niedermann - 4.48-10 -- Add BuildRequires: make -- Add BuildRequires: fonttosfnt >= 1.2.1 (remove font weight workaround) - Closes: https://src.fedoraproject.org/rpms/terminus-fonts/pull-request/3 - -* Wed Jan 27 2021 Fedora Release Engineering - 4.48-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.48-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 2 2020 Akira TAGOH - 4.48-7 -- Workaround wrong weight in Terminus.otb in fontconfig config file. - Resolves: rhbz#1823637 - -* Sat Apr 25 2020 Hans Ulrich Niedermann - 4.48-6 -- complete spec file rewrite based on spectemplate-fonts-1-full.spec -- split off legacy PCF files into -legacy-x11 subpackage - -* Tue Apr 7 2020 Hans Ulrich Niedermann - 4.48-5 -- List *.otb files explicitly (without wildcards) -- Updated package descriptions and spec comments for more accuracy - -* Wed Feb 5 2020 Peng Wu - 4.48-4 -- Use bitmapfonts2otb.py to combine bitmap fonts - -* Fri Jan 31 2020 Fedora Release Engineering - 4.48-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 3 2020 Hans Ulrich Niedermann - 4.48-2 -- Stop shipping VGA fonts in grub subpackage -- Build OTB fonts for compatibility with pango >= 1.44 (#1748495) - -* Tue Aug 27 2019 Hans Ulrich Niedermann - 4.48-1 -- Update to upstream release terminus-font-4.48 -- Ship the Hebrew characters introduced by terminus-font-4.48 - -* Sat Jul 27 2019 Fedora Release Engineering - 4.47-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.47-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Jan 27 2019 Hans Ulrich Niedermann - 4.47-4 -- Only build -grub2 subpackage when arch/dist actually has grub2 -- Address and silence rpmlint warnings - -* Tue Jan 15 2019 Hans Ulrich Niedermann - 4.47-3 -- Update to upstream release terminus-font-4.47 - -* Tue Jan 15 2019 Hans Ulrich Niedermann - 4.46-3 -- Continue shipping the 8bit versions of *.pcf files (#1664054) - -* Tue Dec 18 2018 Hans Ulrich Niedermann - 4.46-2 -- Add grub2 subpackage with *.pf2 fonts - -* Tue Dec 18 2018 Hans Ulrich Niedermann - 4.46-1 -- Update to terminus-font-4.46 - -* Sat Jul 14 2018 Fedora Release Engineering - 4.40-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.40-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.40-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.40-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon May 16 2016 Hans Ulrich Niedermann - 4.40-5 -- Fix terminus-fonts-console README.fedora instructions on checking the initramfs. - -* Fri Feb 05 2016 Fedora Release Engineering - 4.40-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 18 2016 Hans Ulrich Niedermann - 4.40-3 -- Fix spelling issue in %%description -- iconv README-BG from WINDOWS-1251 to utf-8 - -* Sun Jan 17 2016 Hans Ulrich Niedermann - 4.40-2 -- Update to terminus-font-4.40 (#1095285) - -* Fri Jun 19 2015 Fedora Release Engineering - 4.39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jul 10 2014 Jens Petersen - 4.39-1 -- update to 4.39 - -* Sun Jun 08 2014 Fedora Release Engineering - 4.38-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Nov 28 2013 Hans Ulrich Niedermann - 4.38-3 -- Improve instructions for F18+ to console README.fedora (#1000491) - -* Sat Nov 16 2013 Hans Ulrich Niedermann - 4.38-2 -- Add instructions for F18+ to terminus-fonts-console README.fedora (#1000491) - -* Mon Sep 16 2013 Parag - 4.38-1 -- Update to new 4.38 version - -* Sun Aug 04 2013 Fedora Release Engineering - 4.36-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 4.36-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 4.36-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 4.36-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Sep 12 2011 Hans Ulrich Niedermann - 4.36-1 -- Update to terminus-font-4.36 - -* Sat May 21 2011 Hans Ulrich Niedermann - 4.35-1 -- Update to terminus-font-4.35 -- Actually ship the size 18 fonts (upstream fix) - -* Mon May 2 2011 Hans Ulrich Niedermann - 4.34-1 -- Update to terminus-font-4.34 -- Remove patch for alt/ge1.diff (4.34 uses ge1 by default) - -* Wed Feb 09 2011 Fedora Release Engineering - 4.32-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Feb 1 2011 Hans Ulrich Niedermann - 4.32-1 -- Update to 4.32 - -* Fri Jul 16 2010 Hans Ulrich Niedermann - 4.30-2 -- Added License tag to -console subpackage. -- Added note about rebuilding initramfs after changing /etc/sysconfig/i18n. -- Changed URL, SourceN, PatchN to use new location at sourceforge.net. - -* Fri Dec 4 2009 Hans Ulrich Niedermann - 4.30-1 -- update to 4.30 release: - - new size 22 (not very good) - - 25 additional characters - - various small fixes - -* Sun Jul 26 2009 Fedora Release Engineering - 4.28-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Mar 25 2009 Hans Ulrich Niedermann - 4.28-8 -- Rebuild for Fedora 11 to pick up font autodeps (#491973) - -* Wed Feb 25 2009 Fedora Release Engineering - 4.28-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 20 2009 Hans Ulrich Niedermann - 4.28-6 -- fix fontpackages-devel requirement to >= 1.18 (for _fontdir ownership) - -* Fri Feb 20 2009 Hans Ulrich Niedermann - 4.28-5 -- Add information to the fontconfig file -- no need to %%dir %%{_fontdir} in fontpackages-devel >= 1.20 -- Use %%{_sysconfdir} instead of /etc -- Change all %%define instances to %%global -- Drop filesystem requirement for F-10 and later -- Use macro for common parts of descriptions -- Remove unneeded Provides: -- drop unnecessary comment - -* Thu Feb 19 2009 Hans Ulrich Niedermann - 4.28-4 -- change catalog(ue) spelling to US English -- remove unnecessary macro definition of %%tarname -- properly define consolefontdir (no macros) - -* Thu Feb 19 2009 Hans Ulrich Niedermann - 4.28-3 -- generate fonts.dir at build time (bug 483589) - -* Wed Feb 18 2009 Hans Ulrich Niedermann - 4.28-2 -- initial package for new Fedora Font Policy +%autochangelog From 80d1c96c3131a6e3c6b97038d6602294e78cdda3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 19 Aug 2022 13:30:34 +0200 Subject: [PATCH 22/38] Prevent builds on %{ix86} due to lack of grub2-mkfont As grub2.spec has recently dropped %{ix86} from for f36 and later, we need to drop %{ix86} as well because we need grub2-mkfont installed to build. --- terminus-fonts.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 18f7b1c..d9953ed 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -78,11 +78,15 @@ plus CRT VGA-bold for 8x14 and 8x16. # There might be a better way to detect whether this platform has # grub2 available, but this should do the job at least for the time # being. +%if 0%{?fedora} >= 36 +%global grub2_exclude_arches s390 s390x %{ix86} +%else %if 0%{?fedora} >= 29 %global grub2_exclude_arches s390 s390x %else %global grub2_exclude_arches s390 s390x %{arm} %endif +%endif # Owned by the grub2-common package %global grub2_fontdir /usr/share/grub From 430bfddcd91a8adf708335b1158b6e52a53cbeb5 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 19 Aug 2022 15:45:10 +0200 Subject: [PATCH 23/38] fix autorelease value --- terminus-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index d9953ed..bf76b23 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,7 +3,7 @@ ######################################################################## Version: 4.49.1 -Release: %autorelease +Release: %autorelease -b 6 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} From 9e6be5d17912425efc7955d87e6dcad2a69648f3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 19 Aug 2022 15:51:11 +0200 Subject: [PATCH 24/38] print arch information to help with buildarch problems This package apparently is still being built on systems where grub2-mkfont is not available. --- terminus-fonts.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index bf76b23..fe7e3e2 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -238,6 +238,14 @@ fi %fontinstall +cat< Date: Sun, 21 Aug 2022 23:30:36 +0200 Subject: [PATCH 25/38] Use ExcludeArch instead of ifnarching a BuildRequires As koji builds SRPMs on one machine and then builds the SRPM on other machines and SRPMs cannot record conditional BuildRequires, we cannot rely on those. So we try excluding arches which do not have the BuildRequires and hope we can still produce noarch packages. --- terminus-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index fe7e3e2..7364e2c 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -123,9 +123,9 @@ BuildRequires: python3 > 3.5.0 BuildRequires: /usr/bin/bdftopcf BuildRequires: /usr/bin/mkfontdir -%ifnarch %{grub2_exclude_arches} + +ExcludeArch: %{grub2_exclude_arches} BuildRequires: /usr/bin/grub2-mkfont -%endif %fontpkg From 7ace2933208710c046b5db402b933f737ba82fc5 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 27 Nov 2022 23:34:44 +0100 Subject: [PATCH 26/38] Make symlink relative Make the symlink relative which might help in chroot environments to point to the correct place. This will also prevent the following warning during package builds: RPM build warnings: absolute symlink: /etc/X11/fontpath.d/terminus:unscaled -> /usr/share/fonts/terminus-fonts-legacy-x11 --- terminus-fonts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 7364e2c..343c515 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -214,8 +214,12 @@ install -m 0644 -t %{buildroot}%{grub2_fontdir} ter-*.pf2 # We cannot run mkfontdir in %%post because %%post is generated by %%_font_pkg install -m 0755 -d %{buildroot}%{catalog} -ln -s %{legacy_x11_fontdir} %{buildroot}%{catalog}/%{fontfamily}:unscaled + +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} +test -f "%{buildroot}%{catalog}/%{fontfamily}:unscaled/fonts.dir" # Check automatic fonts do not contain unmatched wildcards font_counter=0 From ad4fc4e776e4f0ca9ba13ba8d0d1aaa1e3b025f2 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 27 Nov 2022 23:21:57 +0100 Subject: [PATCH 27/38] Use centered variant for tilde and improved braille variant Apply the td1.diff patch which vertically centers the tilde '~' character to about the vertical position of '=' or '-'. Also improve the look of the braille characters with the br1.diff patch. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2148727 --- terminus-fonts.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 343c515..2c9345a 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -174,8 +174,10 @@ relying on legacy PCF font rendering methods (e.g. GNU Emacs 26). # -n do not recode files, only adjust folding and end of lines #linuxtext *.txt cp -p "%{SOURCE42}" bin/ +patch -s -p1 -b --suffix .br1 -fuzz=0 -i alt/br1.diff patch -s -p1 -b --suffix .dv1 -fuzz=0 -i alt/dv1.diff patch -s -p1 -b --suffix .ij1 -fuzz=0 -i alt/ij1.diff +patch -s -p1 -b --suffix .td1 -fuzz=0 -i alt/td1.diff iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG From bf41170eac4244a7ba0f405dbe86bbfe7af4872a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:52:14 +0000 Subject: [PATCH 28/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e3ea11666ae9a036fc08ea62432e42aa7c6bb2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Feb 2023 12:59:07 +0100 Subject: [PATCH 29/38] Use a package name instead of a file dependency https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies says > Packages SHOULD NOT include file dependencies outside of the following directories: > /usr/bin, /usr/sbin, /etc and also > installation path macros like %{_bindir} MUST NOT be used (Here %_exec_prefix was used indirectly.) This is now becoming more important because dnf5 does not load filelists metadata (i.e. metadata about paths outside of the short list) by default. --- terminus-fonts.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terminus-fonts.spec b/terminus-fonts.spec index 2c9345a..3965600 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -133,7 +133,8 @@ BuildRequires: /usr/bin/grub2-mkfont %package console Requires: kbd -Requires: %{kbddir} +# For /usr/lib/kbd +Requires: kbd-misc Summary: Clean fixed width font (console version) License: OFL From 26b66581291a9c5016a0cfe4742d6286387f359b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:27:22 +0000 Subject: [PATCH 30/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bbae6b76145cc98bc41768d9f06e43221d2ff87e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:50:53 +0000 Subject: [PATCH 31/38] 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 32/38] 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 33/38] 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 34/38] 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 35/38] 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 36/38] 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 37/38] 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 38/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild