From 59a7419104d6faffbc79727d4c98a35f8846ba755ace2b5f7c486aaadf48c82c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 11 Jan 2018 16:25:08 +0000 Subject: [PATCH] Accepting request 563657 from home:scarabeus_iv:branches:M17N:fonts - Format with spec-cleaner - Drop sle11 support as we use just py3 - Drop the BR on python in favor of python3-base OBS-URL: https://build.opensuse.org/request/show/563657 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/gnu-free-fonts?expand=0&rev=17 --- gnu-free-fonts.changes | 7 +++++++ gnu-free-fonts.spec | 22 +++++----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/gnu-free-fonts.changes b/gnu-free-fonts.changes index 92449db..0b99ba4 100644 --- a/gnu-free-fonts.changes +++ b/gnu-free-fonts.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gnu-free-fonts.spec b/gnu-free-fonts.spec index 5fe93b1..01ed56c 100644 --- a/gnu-free-fonts.spec +++ b/gnu-free-fonts.spec @@ -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 @@ -35,9 +34,8 @@ Patch0: reproducible.patch Patch1: freefont-build-using-py3.patch BuildRequires: fontforge >= 20080429 BuildRequires: fontpackages-devel -BuildRequires: python -%reconfigure_fonts_prereq -# freefont was last used at openSUSE 12.1 (version 0.20110523) and at M17N:fonts (version 0.20111101) +BuildRequires: python3-base +# freefont was last used at openSUSE 12.1 (version 0.20110523) Obsoletes: %{fontname} < %{version} Provides: %{fontname} = %{version} Provides: scalable-font-bg @@ -45,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 @@ -62,25 +60,15 @@ one with modulated stroke). %build chmod 755 $RPM_SOURCE_DIR/remove-kana-glyphs $RPM_SOURCE_DIR/remove-kana-glyphs ./sfd/*.sfd -%if 0%{?suse_version} > 1120 -make ttf -%else -cp %{SOURCE11} ./tools -fontforge -lang=ff -script ./tools/GenerateTrueType ./sfd/*.sfd -%endif +make %{?_smp_mflags} ttf %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}