Dominique Leuenberger 2019-09-07 09:29:37 +00:00 committed by Git OBS Bridge
commit 8ece54690c
3 changed files with 30 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Sep 1 15:18:58 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix building with fontforge 20190801
Add make_ff_version_check_forward_compatible.patch
- Use license for COPYING
-------------------------------------------------------------------
Thu Jan 11 16:11:28 UTC 2018 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnu-free-fonts
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -32,6 +32,8 @@ 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
# PATCH-FIX-UPSTREAM -- https://savannah.gnu.org/bugs/index.php?47634
Patch2: make_ff_version_check_forward_compatible.patch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
BuildRequires: python3-base
@ -56,6 +58,7 @@ one with modulated stroke).
%setup -q -n %{fontname}-%{fontversion}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
chmod 755 $RPM_SOURCE_DIR/remove-kana-glyphs
@ -69,7 +72,8 @@ install -pm 0644 sfd/*.ttf %{buildroot}%{_ttfontsdir}/
%reconfigure_fonts_scriptlets
%files
%doc AUTHORS COPYING CREDITS ChangeLog README notes/troubleshooting.txt notes/usage.txt
%license COPYING
%doc AUTHORS CREDITS ChangeLog README notes/troubleshooting.txt notes/usage.txt
%{_ttfontsdir}
%changelog

View File

@ -0,0 +1,16 @@
diff --git a/sfd/Makefile b/sfd/Makefile
index fdbc61f..67e2dc9 100644
--- a/sfd/Makefile
+++ b/sfd/Makefile
@@ -11,9 +11,9 @@ FF=fontforge -lang=ff -script
FFPY=fontforge -lang=py -script
FFPY=fontforge -lang=py -script
-ffversion=`fontforge --version 2> /dev/null | grep '^fontforge' | sed -e 's/^fontforge //'`
+ffversion:=`fontforge -version 2> /dev/null | grep '^libfontforge' | sed -e 's/^libfontforge //'`
-TESTFF=if test -z ${ffversion}; then echo FontForge program is required to build FreeFont; exit 1; fi; if test `fontforge --version 2> /dev/null | grep '^fontforge' | sed -e 's/^fontforge //'` -lt 20080429 ; then echo FontForge version too old; exit 1; fi
+TESTFF:=if test -z $(ffversion); then echo FontForge program is required to build FreeFont; exit 1; fi; if test $(ffversion) -lt 20080429 ; then echo FontForge version too old; exit 1; fi
.SUFFIXES: $(SUFFIXES) .sfd .ttf .otf .woff