Accepting request 563659 from M17N:fonts

OBS-URL: https://build.opensuse.org/request/show/563659
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnu-free-fonts?expand=0&rev=9

freefont-build-using-py3.patch

@@ -0,0 +1,76 @@
+Index: freefont-20120503/tools/generate/MacTT
+===================================================================
+--- freefont-20120503.orig/tools/generate/MacTT
++++ freefont-20120503/tools/generate/MacTT
+@@ -43,7 +43,7 @@ if argc > 1:
+ 		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 @@ if argc > 1:
+ 		#f.generate( ttfile, flags=('opentype','old-kern') )
+ 		f.close()
+ else:
+-	print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++	print ("Usage: " + scriptname + " font.sfd [font.sfd ...]")
+Index: freefont-20120503/tools/generate/OpenType
+===================================================================
+--- freefont-20120503.orig/tools/generate/OpenType
++++ freefont-20120503/tools/generate/OpenType
+@@ -42,7 +42,7 @@ if argc > 1:
+ 		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 @@ if argc > 1:
+ 		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 ...]")
+Index: freefont-20120503/tools/generate/TrueType
+===================================================================
+--- freefont-20120503.orig/tools/generate/TrueType
++++ freefont-20120503/tools/generate/TrueType
+@@ -42,7 +42,7 @@ if argc > 1:
+ 		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 @@ if argc > 1:
+ 		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 ...]")
+Index: freefont-20120503/tools/generate/WOFF
+===================================================================
+--- freefont-20120503.orig/tools/generate/WOFF
++++ freefont-20120503/tools/generate/WOFF
+@@ -153,7 +153,7 @@ if argc > 1:
+ 		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 @@ if argc > 1:
+ 		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 ...]")

gnu-free-fonts.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 11 16:11:28 UTC 2018 - tchvatal@suse.com
+
+- Format with spec-cleaner
+- Drop sle11 support as we use just py3
+- Drop the BR on python in favor of python3-base
+
+-------------------------------------------------------------------
+Tue Jan  9 17:22:51 UTC 2018 - dimstar@opensuse.org
+
+- Add freefont-build-using-py3.patch: Fix build when using python3.
+
 -------------------------------------------------------------------
 Sun Apr 17 14:36:22 UTC 2016 - bwiedemann@suse.com
 

gnu-free-fonts.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnu-free-fonts
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,7 @@
 
 %define fontname freefont
 %define fontversion 20120503
-%define _ttfontsdir /usr/share/fonts/truetype
+%define _ttfontsdir %{_datadir}/fonts/truetype
-
 Name:           gnu-free-fonts
 Version:        0.%{fontversion}
 Release:        0
@@ -32,11 +31,11 @@ Source10:       remove-kana-glyphs
 Source11:       GenerateTrueType
 # PATCH-FIX-UPSTREAM -- bmwiedemann fix build-compare https://savannah.gnu.org/bugs/index.php?47722
 Patch0:         reproducible.patch
+Patch1:         freefont-build-using-py3.patch
 BuildRequires:  fontforge >= 20080429
 BuildRequires:  fontpackages-devel
-BuildRequires:  python
+BuildRequires:  python3-base
-%reconfigure_fonts_prereq
+# freefont was last used at openSUSE 12.1 (version 0.20110523)
-# freefont was last used at openSUSE 12.1 (version 0.20110523) and at M17N:fonts (version 0.20111101)
 Obsoletes:      %{fontname} < %{version}
 Provides:       %{fontname} = %{version}
 Provides:       scalable-font-bg
@@ -44,8 +43,8 @@ Provides:       scalable-font-el
 Provides:       scalable-font-he
 Provides:       scalable-font-ru
 Provides:       locale(bg;el;he;ru;vi)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+%reconfigure_fonts_prereq
 
 %description
 A set of free outline (OpenType, for example) fonts covering the ISO
@@ -56,29 +55,20 @@ one with modulated stroke).
 %prep
 %setup -q -n %{fontname}-%{fontversion}
 %patch0 -p1
+%patch1 -p1
 
 %build
 chmod 755 $RPM_SOURCE_DIR/remove-kana-glyphs
 $RPM_SOURCE_DIR/remove-kana-glyphs ./sfd/*.sfd
-%if 0%{?suse_version} > 1120
+make %{?_smp_mflags} ttf
-make ttf
-%else
-cp %{SOURCE11} ./tools
-fontforge -lang=ff -script ./tools/GenerateTrueType ./sfd/*.sfd
-%endif
 
 %install
 mkdir -p %{buildroot}%{_ttfontsdir}/
-%if 0%{?suse_version} > 1120
 install -pm 0644 sfd/*.ttf %{buildroot}%{_ttfontsdir}/
-%else
-install -pm 0644 *.ttf %{buildroot}%{_ttfontsdir}/
-%endif
 
 %reconfigure_fonts_scriptlets
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING CREDITS ChangeLog README notes/troubleshooting.txt notes/usage.txt
 %{_ttfontsdir}