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 c68ad6b..cf39623 100644 --- a/terminus-fonts.spec +++ b/terminus-fonts.spec @@ -3,18 +3,18 @@ ######################################################################## Version: 4.49.1 -Release: 12%{?dist} +Release: %autorelease -b 6 URL: http://terminus-font.sourceforge.net/ %global foundry %{nil} -%global fontlicense OFL +%global fontlicense OFL-1.1 # # The following directives are lists of space-separated shell globs # – matching files associated with the font family, # – as they exist in the build root, # — at the end of the %%build stage: # – legal files (licensing…) -%global fontlicenses OFL.txt +%global fontlicenses OFL.TXT # – exclusions from the “fontlicenses” list %global fontlicensesex %{nil} # – documentation files @@ -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 @@ -117,11 +121,11 @@ BuildRequires: python3 > 3.5.0 # For generating legacy fonts (*.pcf) BuildRequires: /usr/bin/bdftopcf -BuildRequires: /usr/bin/mkfontdir +BuildRequires: mkfontdir -%ifnarch %{grub2_exclude_arches} + +ExcludeArch: %{grub2_exclude_arches} BuildRequires: /usr/bin/grub2-mkfont -%endif %fontpkg @@ -129,9 +133,10 @@ 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 +License: OFL-1.1 %description console %fontdescription @@ -142,7 +147,7 @@ This package contains the fonts to use with the Linux console. %package grub2 Requires: grub2-common Summary: Clean fixed width font (grub2 version) -License: OFL +License: OFL-1.1 %description grub2 %fontdescription @@ -152,7 +157,7 @@ This package contains the fonts to use with the grub2 boot loader. %package legacy-x11 Summary: Clean fixed width font (legacy PCF version) -License: OFL +License: OFL-1.1 # Require the fontconfig file Requires: %{name} = %{evr} @@ -170,8 +175,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 @@ -210,8 +217,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 -/usr/bin/mkfontdir %{buildroot}%{legacy_x11_fontdir} + +ln -s "$(echo '%{catalog}/%{fontfamily}:unscaled' | sed -e 's|[^/]||g' -e 's|/|../|g' -e 's|/../$||')%{legacy_x11_fontdir}" "%{buildroot}%{catalog}/%{fontfamily}:unscaled" +test -d "%{buildroot}%{catalog}/%{fontfamily}:unscaled/" + +mkfontdir %{buildroot}%{legacy_x11_fontdir} +test -f "%{buildroot}%{catalog}/%{fontfamily}:unscaled/fonts.dir" # Check automatic fonts do not contain unmatched wildcards font_counter=0 @@ -234,6 +245,14 @@ fi %fontinstall +cat< - 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