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

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

diff --git a/google-opensans-fonts.spec b/google-opensans-fonts.spec
index ef004d7..49654e6 100644
--- a/google-opensans-fonts.spec
+++ b/google-opensans-fonts.spec
@@ -22,10 +22,10 @@
 Name:           google-opensans-fonts
 Version:        1.0
 Release:        0
-License:        Apache-2.0
 Summary:        Humanist Sans Serif Typeface
-Url:            http://code.google.com/webfonts/family?family=Open+Sans
+License:        Apache-2.0
 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
@@ -43,6 +43,8 @@ open forms and a neutral, yet friendly appearance. It was
 optimized for print, web, and mobile interfaces, and has
 excellent legibility characteristics in its letterforms.
 
+Designer: Steve Matteson
+
 %prep
 %setup -q -n %{fontname} -c %{fontname}
 

From 8c60313ef28620824045aeeb2552d48f40a723618e8f43e21ea1cbfd054c5330 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 10 Jul 2012 15:12:31 +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-opensans-fonts?expand=0&rev=8
---
 google-opensans-fonts.changes |  6 ++++++
 google-opensans-fonts.spec    | 22 ++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

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