Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

The CI complains that GFDL-1.3 is not on the allowed license list, and
it is technically correct.

.gitignore

@@ -10,3 +10,10 @@
 /unifont-9.0.01.tar.gz
 /unifont-9.0.02.tar.gz
 /unifont-9.0.06.tar.gz
+/unifont-10.0.07.tar.gz
+/unifont-12.0.01.tar.gz
+/unifont-12.1.02.tar.gz
+/unifont-13.0.05.tar.gz
+/unifont-14.0.01.tar.gz
+/unifont-15.0.01.tar.gz
+/unifont-16.0.01.tar.gz

changelog

@@ -0,0 +1,116 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.05-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar  1 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 13.0.05-2
+- Require bdftopcf instead of xorg-x11-font-utils
+  (https://fedoraproject.org/wiki/Changes/XorgUtilityDeaggregation)
+
+* Wed Feb  3 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 13.0.05-1
+- Latest upstream version
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.01-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.01-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.01-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.01-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Mar  7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 12.0.01-1
+- Update to latest version (more glyphs from Unicode 12.0).
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.07-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Apr 15 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 10.0.07-1
+- Update to latest version (#1567644)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.06-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.06-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.06-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 11 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.06-1
+- Uupdate to latest version (removal of serifs from Cherokee letters,
+  Pikto CSUR glyph improvements)
+
+* Sun Sep 11 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.02-1
+- Update to latest version (3 new CSUR scripts, bugfixes)
+
+* Sun Jul  3 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.01-1
+- Update to latest version (increased coverage for Unicode 9.0)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.06-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Oct 24 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.06-1
+- Update to new upstream version
+- Include unifont_upper.ttf in the package
+
+* Thu Oct 16 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.04-2
+- Add metadata file for the font, not appdata
+
+* Wed Oct 15 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.04-1
+- Update to new upstream version
+- Add appdata file for the font
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 01 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.03-1
+- Update to new upstream version
+
+* Mon Jun 30 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.02-1
+- Update to new upstream version
+
+* Sun Jun 22 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.01-1
+- Update to new upstream version
+- Split out unifont-viewer subpackage
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.3.20140214-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Feb 07 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140214-1
+- Update to new upstream version
+- License for info files is changed to GFDL
+
+* Fri Feb 07 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140204-1
+- Update to new upstream version
+
+* Sun Feb 02 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140202-1
+- Update to new upstream version
+
+* Sat Dec 28 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131221-2
+- Move BR: fontpackages-devel to -fonts not to the main package
+
+* Fri Dec 27 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131221-1
+- Update to new upstream version
+
+* Thu Dec 05 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-4
+- Do not strip binaries during installation
+
+* Thu Dec 05 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-3
+- Fix build flags
+
+* Sun Dec 01 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-2
+- Add missing BuildRequires
+
+* Sun Dec 01 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-1
+- Initial package

sources

@@ -1 +1 @@
-SHA512 (unifont-9.0.06.tar.gz) = 767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988
+SHA512 (unifont-16.0.01.tar.gz) = cfbb6598fc7fda7bbe1d061d3d35e3433df033bece0468fe469338ecac82fddd3fd9fd35f4693147284f28b02011939cad3c2570d878677c472227909f65af27

unifont.spec

@@ -1,25 +1,28 @@
 Name:            unifont
-Version:         9.0.06
-Release:         2%{?dist}
-License:         GPLv2+ and GFDL
+Version:         16.0.01
+Release:         %autorelease
+License:         GPL-2.0-or-later AND OFL-1.1 AND GFDL-1.3-or-later
 Url:             https://savannah.gnu.org/projects/unifont
 Summary:         Tools and glyph descriptions in a very simple text format
 
-Source0:         http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:         https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:         unifont.metainfo.xml
 
+BuildRequires:   make
+BuildRequires:   gcc
 BuildRequires:   perl-generators
-BuildRequires:   xorg-x11-font-utils
+BuildRequires:   perl-GD
+BuildRequires:   bdftopcf
+BuildRequires:   bdf2psf
 BuildRequires:   fontforge
 BuildRequires:   fontpackages-devel
 BuildRequires:   texinfo
-Requires(post):  info
-Requires(preun): info
+BuildRequires:   ImageMagick
 
 %description
-A font with a glyph for every visible Unicode Basic Multilingual Plane
-code point and more, with supporting utilities to modify the
-font. This package contains tools and glyph descriptions.
+A font with a glyph for every visible Unicode Basic Multilingual Plane code
+point and more, with supporting utilities to modify the font. This package
+contains tools and glyph descriptions.
 
 %package fonts
 BuildArch: noarch
@@ -28,20 +31,29 @@ Summary: Unicode font with a glyph for every visible BMP code point
 Requires:        fontpackages-filesystem
 
 %description fonts
-A fixed-width Unicode font with a glyph for every visible Unicode 7.0
-Basic Multilingual Plane code point and more. The latest version of
-Unifont includes approximately 54,700 glyphs for all the visible
-Unicode BMP code points.
+A fixed-width Unicode font with a glyph for every visible Unicode 7.0 Basic
+Multilingual Plane code point (over 55,000 glyphs) and some glyphs beyond BMP.
 
-This font strives for very wide coverage rather than beauty, so use it
-only as fallback or for special purposes.
+This font strives for very wide coverage rather than beauty, so use it only as
+fallback or for special purposes.
+
+This package contains unicode fonts in OTF format.
+
+%package ttf-fonts
+BuildArch: noarch
+Summary: Unicode font with a glyph for every visible BMP code point
+Requires: (unifont-fonts = %{version}-%{release} if unifont-fonts)
+
+%description ttf-fonts
+This package contains unicode fonts in TTF format.
+It is provided for compatibility, and unifont-fonts should be used instead.
 
 %package viewer
 BuildArch: noarch
 Summary: Graphical viewer for unifont
 
 %description viewer
-A graphical viewer for unifont.
+A graphical viewer for unifont source character definitions.
 
 %prep
 %setup -q -n unifont-%{version}
@@ -50,28 +62,25 @@ sed -i 's/^install: .*/install:/' Makefile
 sed -i 's/install -s/install/' src/Makefile
 
 %build
+%make_build CFLAGS='%{optflags}'
 # Makefile is broken with parallel builds
-make CFLAGS='%{optflags}'
+make -C font all ttf upperttf
 make -C doc unifont.info
 
 %install
-%make_install USRDIR=/usr COMPRESS=0 TTFDEST='$(DESTDIR)/usr/share/fonts/unifont'
+%make_install USRDIR=/usr COMPRESS=0 \
+  OTFDEST='$(DESTDIR)/usr/share/fonts/unifont'
+install -Dm0644 font/compiled/unifont-%{version}.ttf %{buildroot}%{_fontdir}/unifont.ttf
+install -Dm0644 font/compiled/unifont_upper-%{version}.ttf %{buildroot}%{_fontdir}/unifont_upper.ttf
+
 find %{buildroot}/usr/share/unifont/ -type f \! -name %{name}.hex -delete
 rm -rv %{buildroot}/usr/share/fonts/X11
 rm -v %{buildroot}%{_fontdir}/*sample*
-rm -v %{buildroot}%{_fontdir}/unifont_*csur*.ttf
 install -Dm0644 doc/unifont.info %{buildroot}%{_infodir}/unifont.info
 install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/unifont.metainfo.xml
 # Remove APL font for now
 rm %{buildroot}/usr/share/consolefonts/Unifont-APL8x16.psf.gz
 
-%post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-%preun
-if [ $1 = 0 ] ; then
-/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
 %files
 %{_bindir}/*
 %{_datadir}/%{name}/
@@ -82,7 +91,11 @@ fi
 %{_infodir}/unifont.*
 %exclude %{_bindir}/unifont-viewer
 
-%_font_pkg *.ttf
+%_font_pkg *.otf
+%{_datadir}/appdata/
+%license COPYING
+
+%_font_pkg -n ttf *.ttf
 %{_datadir}/appdata/
 %license COPYING
 
@@ -91,76 +104,4 @@ fi
 %license COPYING
 
 %changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.06-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Jan 11 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.06-1
-- Uupdate to latest version (removal of serifs from Cherokee letters,
-  Pikto CSUR glyph improvements)
-
-* Sun Sep 11 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.02-1
-- Update to latest version (3 new CSUR scripts, bugfixes)
-
-* Sun Jul  3 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.0.01-1
-- Update to latest version (increased coverage for Unicode 9.0)
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.06-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.06-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Oct 24 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.06-1
-- Update to new upstream version
-- Include unifont_upper.ttf in the package
-
-* Thu Oct 16 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.04-2
-- Add metadata file for the font, not appdata
-
-* Wed Oct 15 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.04-1
-- Update to new upstream version
-- Add appdata file for the font
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.03-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Tue Jul 01 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.03-1
-- Update to new upstream version
-
-* Mon Jun 30 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.02-1
-- Update to new upstream version
-
-* Sun Jun 22 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.0.01-1
-- Update to new upstream version
-- Split out unifont-viewer subpackage
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.3.20140214-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Feb 07 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140214-1
-- Update to new upstream version
-- License for info files is changed to GFDL
-
-* Fri Feb 07 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140204-1
-- Update to new upstream version
-
-* Sun Feb 02 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20140202-1
-- Update to new upstream version
-
-* Sat Dec 28 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131221-2
-- Move BR: fontpackages-devel to -fonts not to the main package
-
-* Fri Dec 27 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131221-1
-- Update to new upstream version
-
-* Thu Dec 05 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-4
-- Do not strip binaries during installation
-
-* Thu Dec 05 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-3
-- Fix build flags
-
-* Sun Dec 01 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-2
-- Add missing BuildRequires
-
-* Sun Dec 01 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3.20131020-1
-- Initial package
+%autochangelog