diff --git a/.gnu-free-fonts.metadata b/.gnu-free-fonts.metadata index 2d85e61..9598758 100644 --- a/.gnu-free-fonts.metadata +++ b/.gnu-free-fonts.metadata @@ -1 +1 @@ -db724016287db0ce06c4c51b79b4339ba11dfbb3 SOURCES/freefont-src-20120503.tar.gz +db724016287db0ce06c4c51b79b4339ba11dfbb3 SOURCES/freefont-src-20120503.tar.gz diff --git a/SOURCES/gnu-free-sans-square-dot-glyph-fix.patch b/SOURCES/gnu-free-sans-square-dot-glyph-fix.patch new file mode 100644 index 0000000..b13dece --- /dev/null +++ b/SOURCES/gnu-free-sans-square-dot-glyph-fix.patch @@ -0,0 +1,143 @@ +--- freefont-20120503.old/sfd/FreeSans.sfd 2023-05-11 13:54:34.003872193 +0530 ++++ freefont-20120503.old/sfd/FreeSans.sfd 2023-05-18 12:13:57.320957919 +0530 +@@ -193447,8 +193448,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2a +-Encoding: 11818 11818 6215 ++StartChar: uni2e2c ++Encoding: 11818 11820 6215 + Width: 660 + Flags: HMW + LayerCount: 2 +@@ -193460,8 +193461,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2b +-Encoding: 11819 11819 6216 ++StartChar: uni2e2a ++Encoding: 11819 11818 6216 + Width: 623 + Flags: HMW + LayerCount: 2 +@@ -193470,8 +193471,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2c +-Encoding: 11820 11820 6217 ++StartChar: uni2e2b ++Encoding: 11820 11819 6217 + Width: 623 + Flags: HMW + LayerCount: 2 + +--- freefont-20120503.old/sfd/FreeSansBold.sfd 2023-05-27 11:49:31.972472859 +0530 ++++ freefont-20120503/sfd/FreeSansBold.sfd 2023-05-27 12:01:21.108967266 +0530 +@@ -52288,8 +52289,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2a +-Encoding: 11818 11818 2645 ++StartChar: uni2e2c ++Encoding: 11818 11820 2645 + Width: 660 + Flags: HW + LayerCount: 2 +@@ -52301,8 +52302,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2b +-Encoding: 11819 11819 2646 ++StartChar: uni2e2a ++Encoding: 11819 11818 2646 + Width: 623 + Flags: HW + LayerCount: 2 +@@ -52311,8 +52312,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2c +-Encoding: 11820 11820 2647 ++StartChar: uni2e2b ++Encoding: 11820 11819 2647 + Width: 623 + Flags: HW + LayerCount: 2 + +--- freefont-20120503.old/sfd/FreeSansBoldOblique.sfd 2012-05-03 18:53:49.000000000 +0530 ++++ freefont-20120503/sfd/FreeSansBoldOblique.sfd 2023-05-27 11:59:28.625015029 +0530 +@@ -46080,8 +46081,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2a +-Encoding: 11818 11818 2392 ++StartChar: uni2e2c ++Encoding: 11818 11820 2392 + Width: 660 + Flags: HW + LayerCount: 2 +@@ -46093,8 +46094,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2b +-Encoding: 11819 11819 2393 ++StartChar: uni2e2a ++Encoding: 11819 11818 2393 + Width: 660 + Flags: HW + LayerCount: 2 +@@ -46105,8 +46106,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2c +-Encoding: 11820 11820 2394 ++StartChar: uni2e2b ++Encoding: 11820 11819 2394 + Width: 660 + Flags: HW + LayerCount: 2 + +--- freefont-20120503.old/sfd/FreeSansOblique.sfd 2012-05-03 18:53:49.000000000 +0530 ++++ freefont-20120503/sfd/FreeSansOblique.sfd 2023-05-27 11:57:01.703453459 +0530 +@@ -76021,8 +76022,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2a +-Encoding: 11818 11818 3026 ++StartChar: uni2e2c ++Encoding: 11818 11820 3026 + Width: 660 + Flags: HW + LayerCount: 2 +@@ -76034,8 +76035,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2b +-Encoding: 11819 11819 3027 ++StartChar: uni2e2a ++Encoding: 11819 11818 3027 + Width: 623 + Flags: HW + LayerCount: 2 +@@ -76046,8 +76047,8 @@ + Validated: 32769 + EndChar + +-StartChar: uni2e2c +-Encoding: 11820 11820 3028 ++StartChar: uni2e2b ++Encoding: 11820 11819 3028 + Width: 623 + Flags: HW + LayerCount: 2 diff --git a/SOURCES/python3.patch b/SOURCES/python3.patch new file mode 100644 index 0000000..a0d5c38 --- /dev/null +++ b/SOURCES/python3.patch @@ -0,0 +1,68 @@ +--- a/tools/generate/MacTT.bak 2012-05-03 08:23:30.000000000 -0500 ++++ b/tools/generate/MacTT 2023-10-18 11:09:56.437731484 -0500 +@@ -43,7 +43,7 @@ + f = fontforge.open( argv[i] ) + ttfile = f.fontname + ".mac.ttf" + vstr = trim_version_str( f ) +- print "Generating Mac TrueType file ", ttfile, ' ', vstr ++ print("Generating Mac TrueType file ", ttfile, ' ', vstr) + f.selection.all() + f.autoHint() + f.autoInstr() +@@ -51,4 +51,4 @@ + #f.generate( ttfile, flags=('opentype','old-kern') ) + f.close() + else: +- print "Usage: " + scriptname + " font.sfd [font.sfd ...]" ++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]") +--- a/tools/generate/OpenType.bak 2012-05-03 08:23:30.000000000 -0500 ++++ b/tools/generate/OpenType 2023-10-18 11:09:56.901729078 -0500 +@@ -42,7 +42,7 @@ + f = fontforge.open( argv[i] ) + otfile = f.fontname + ".otf" + vstr = trim_version_str( f ) +- print "Generating OpenType file ", otfile, ' ', vstr ++ print("Generating OpenType file ", otfile, ' ', vstr) + # Wanted to set to 'UniocdeBmp' if there were no high unicodes + # but all attemtps to determine that from Python failed. + f.encoding = 'UnicodeFull' +@@ -51,4 +51,4 @@ + f.generate( otfile, flags=('opentype','old-kern','round') ) + f.close() + else: +- print "Usage: " + scriptname + " font.sfd [font.sfd ...]" ++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]") +--- a/tools/generate/TrueType.bak 2012-05-03 08:23:30.000000000 -0500 ++++ b/tools/generate/TrueType 2023-10-18 11:09:57.386726565 -0500 +@@ -42,7 +42,7 @@ + f = fontforge.open( sys.argv[i] ) + ttfile = f.fontname + ".ttf" + vstr = trim_version_str( f ) +- print "Generating TrueType file ", ttfile, ' ', vstr ++ print("Generating TrueType file ", ttfile, ' ', vstr) + # Wanted to set to 'UniocdeBmp' if there were no high unicodes + # but all attemtps to determine that from Python failed. + f.encoding = 'UnicodeFull' +@@ -54,4 +54,4 @@ + f.generate( ttfile, flags=('opentype','old-kern','no-hints') ) + f.close() + else: +- print "Usage: " + scriptname + " font.sfd [font.sfd ...]" ++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]") +--- a/tools/generate/WOFF.bak 2012-05-03 08:23:30.000000000 -0500 ++++ b/tools/generate/WOFF 2023-10-18 11:09:57.892723941 -0500 +@@ -153,7 +153,7 @@ + f = fontforge.open( sys.argv[i] ) + woff_file = f.fontname + ".woff" + vstr = trim_version_str( f ) +- print "Generating WOFF file ", woff_file, ' ', vstr ++ print("Generating WOFF file ", woff_file, ' ', vstr) + # Wanted to set to 'UniocdeBmp' if there were no high unicodes + # but all attemtps to determine that from Python failed. + f.encoding = 'UnicodeFull' +@@ -171,4 +171,4 @@ + f.generate( woff_file, flags=('opentype','no-hints') ) + f.close() + else: +- print "Usage: " + scriptname + " font.sfd [font.sfd ...]" ++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]") diff --git a/SPECS/gnu-free-fonts.spec b/SPECS/gnu-free-fonts.spec index 9762095..98ef884 100644 --- a/SPECS/gnu-free-fonts.spec +++ b/SPECS/gnu-free-fonts.spec @@ -3,11 +3,11 @@ Name: %{fontname}-fonts Version: 20120503 -Release: 18%{?dist} +Release: 34%{?dist} Summary: Free UCS Outline Fonts # Standard font exception -License: GPLv3+ with exceptions +License: GPL-3.0-or-later with exceptions URL: http://www.gnu.org/software/freefont/ Source0: http://ftp.gnu.org/gnu/freefont/freefont-src-%{version}.tar.gz Source2: %{fontconf}-mono.conf @@ -19,11 +19,12 @@ Source7: %{fontname}-sans.metainfo.xml Source8: %{fontname}-serif.metainfo.xml Patch0: gnu-free-fonts-devanagari-rendering.patch +Patch1: gnu-free-sans-square-dot-glyph-fix.patch +Patch2: python3.patch BuildArch: noarch +BuildRequires: make BuildRequires: fontpackages-devel fontforge -# following is needed as we are calling /usr/bin/2to3 -BuildRequires: /usr/bin/2to3 %global common_desc \ Gnu FreeFont is a free family of scalable outline fonts, suitable for general \ @@ -84,21 +85,11 @@ This package contains the GNU FreeFont serif font. %prep -%setup -qn freefont-%{version} +%autosetup -n freefont-%{version} -p1 -%patch0 -p1 -b .devanagari - -# move build scripts to python3 compatible code -pushd tools -pushd generate # Following for loop should not be used on pyc files # better remove pre-compiled buildutils.pyc file -rm *.pyc -for item in `ls`;do - 2to3 -w $item -done -popd -popd +rm tools/generate/*.pyc %build make @@ -151,6 +142,57 @@ install -Dm 0644 -p %{SOURCE8} \ %{_datadir}/appdata/%{fontname}.metainfo.xml %changelog +* Sun Jan 05 2025 Arkady L. Shane - 20120503-34 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 20120503-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 20120503-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 20120503-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 20120503-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat May 27 2023 Parag Nemade - 20120503-30 +- Resolves:rh#1813728 - Square four dot Unicode character has incorrect glyph + +* Wed Mar 01 2023 Gwyn Ciesla - 20120503-29 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 20120503-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 20120503-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 20120503-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 20120503-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 20120503-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 20120503-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 20120503-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 20120503-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 20120503-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 20120503-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 02 2018 Gwyn Ciesla - 20120503-18 - BR fix.