diff --git a/google-opensans-fonts.changes b/google-opensans-fonts.changes index a9a18b5..6bc54e6 100644 --- a/google-opensans-fonts.changes +++ b/google-opensans-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:13 UTC 2012 - pgajdos@suse.com diff --git a/google-opensans-fonts.spec b/google-opensans-fonts.spec index 49654e6..b20414d 100644 --- a/google-opensans-fonts.spec +++ b/google-opensans-fonts.spec @@ -16,7 +16,6 @@ # -%define fontdir %{_datadir}/fonts/truetype %define fontname opensans Name: google-opensans-fonts @@ -28,7 +27,9 @@ Group: System/X11/Fonts Url: http://code.google.com/webfonts/family?family=Open+Sans Source0: %{fontname}.tar.bz2 BuildRequires: bzip2 -Requires(pre): %suseconfig_fonts_prereq +BuildRequires: dos2unix +BuildRequires: fontpackages-devel +%reconfigure_fonts_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -49,22 +50,19 @@ Designer: Steve Matteson %setup -q -n %{fontname} -c %{fontname} %build -# -- nothing to do -- +chmod 644 %{fontname}/LICENSE.txt +dos2unix %{fontname}/LICENSE.txt %install -mkdir -p %{buildroot}%{fontdir}/ -install -m 0644 %{fontname}/*.ttf %{buildroot}%{fontdir} +mkdir -p %{buildroot}%{_ttfontsdir}/ +install -m 0644 %{fontname}/*.ttf %{buildroot}%{_ttfontsdir} -%post -%run_suseconfig_fonts - -%postun -%run_suseconfig_fonts +%reconfigure_fonts_scriptlets %files %defattr(-, root,root) -%dir %{fontdir}/ -%{fontdir}/* +%dir %{_ttfontsdir}/ +%{_ttfontsdir}/* %doc %{fontname}/LICENSE.txt %changelog