diff --git a/google-merriweather-fonts.changes b/google-merriweather-fonts.changes index acc3c46..9a24022 100644 --- a/google-merriweather-fonts.changes +++ b/google-merriweather-fonts.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 4 12:39:06 CEST 2012 - pgajdos@suse.cz + +- amend spec file to reflect new font packaging scheme + (see openFATE#313536); + ------------------------------------------------------------------- Thu May 17 09:10:12 UTC 2012 - pgajdos@suse.com diff --git a/google-merriweather-fonts.spec b/google-merriweather-fonts.spec index 47e3c61..ebb8722 100644 --- a/google-merriweather-fonts.spec +++ b/google-merriweather-fonts.spec @@ -16,7 +16,6 @@ # -%define fontdir %{_datadir}/fonts/truetype %define fontname merriweather Name: google-merriweather-fonts @@ -28,6 +27,8 @@ Group: System/X11/Fonts Url: http://www.google.com/webfonts/specimen/Merriweather Source0: %{fontname}-%{version}.tar.bz2 Source1: OFL.txt +BuildRequires: fontpackages-devel +%reconfigure_fonts_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -58,14 +59,16 @@ Designer: Eben Sorkin cp %{SOURCE1} . %install -mkdir -p %{buildroot}%{fontdir} -cp *.ttf %{buildroot}%{fontdir} +mkdir -p %{buildroot}%{_ttfontsdir} +cp *.ttf %{buildroot}%{_ttfontsdir} + +%reconfigure_fonts_scriptlets %files %defattr(-, root, root) %doc METADATA FONTLOG.txt -%dir %{fontdir} -%{fontdir}/*.ttf +%dir %{_ttfontsdir} +%{_ttfontsdir}/*.ttf %doc OFL.txt %changelog