From 72898c397ad85eb4f399a37534c81bf0ac0be9fb1f25e6a529880bda0b12b553 Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <thomas.schraitle@suse.com>
Date: Fri, 29 Jun 2012 20:30:46 +0000
Subject: [PATCH 1/2] Added designer to description

OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-merriweather-fonts?expand=0&rev=8
---
 google-merriweather-fonts.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/google-merriweather-fonts.spec b/google-merriweather-fonts.spec
index 7b05ea2..47e3c61 100644
--- a/google-merriweather-fonts.spec
+++ b/google-merriweather-fonts.spec
@@ -22,10 +22,10 @@
 Name:           google-merriweather-fonts
 Version:        1.3
 Release:        0
-License:        OFL-1.1
 Summary:        Readable Text Serif Font for Screen
-Url:            http://www.google.com/webfonts/specimen/Merriweather
+License:        OFL-1.1
 Group:          System/X11/Fonts
+Url:            http://www.google.com/webfonts/specimen/Merriweather
 Source0:        %{fontname}-%{version}.tar.bz2
 Source1:        OFL.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -49,6 +49,8 @@ and even fund specific features if if they are outside of the current scope of w
 For more information and to stay updated see Eben Sorkin's blog and Flickr stream and
 the Merriweather Twitter microblog.
 
+Designer: Eben Sorkin
+
 %prep
 %setup -n %{fontname}-%{version}
 

From ea1d3ddc08f77fecd0cb2453889c0959ca93e422363f974dbc03aa4f60ecb8d3 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 10 Jul 2012 15:16:12 +0000
Subject: [PATCH 2/2] - amend spec file to reflect new font packaging scheme  
 (see openFATE#313536);

OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-merriweather-fonts?expand=0&rev=9
---
 google-merriweather-fonts.changes |  6 ++++++
 google-merriweather-fonts.spec    | 13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

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