From 6bfcce98594412abbd2ccc930ce2babb377d715d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:04:53 +0000 Subject: [PATCH 01/21] - 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 02/21] - 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 03/21] 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 04/21] 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 05/21] 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 06/21] 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 07/21] 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 08/21] 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 09/21] 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 10/21] 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 11/21] 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 12/21] 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 13/21] 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 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild