- Added macros, fixed license string

OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-merriweather-fonts?expand=0&rev=2

google-merriweather-fonts.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 15 07:32:43 UTC 2012 - toms@opensuse.org
+
+- Added macros
+
 -------------------------------------------------------------------
 Tue Feb 14 10:26:39 UTC 2012 - jzwickl@suse.de
 

google-merriweather-fonts.spec

@@ -1,5 +1,7 @@
 #
-# spec file for package <PACKAGE>
+# spec file for package google-merriweather-fonts
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +14,18 @@
 
 # Please submit bugfixe or comments via http://bugs.opensuse.org/
 
-# Definitions
+%define fontdir  %{_datadir}/fonts/truetype
-
+%define fontname merriweather
 
 
 Name:		google-merriweather-fonts
 Summary:	Readable Text Serif Font for Screen
-License:		OFL 1.1
+License:	OFL-1.1
 Group:		System/X11/Fonts
-#BuildRequires:		
-#Requires:		
 BuildArch:	noarch
 Version:	1.3
 Release:	0
-Source0:		merriweather-%{version}.tar.bz2
+Source0:	%{fontname}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 Url:		http://www.google.com/webfonts/specimen/Merriweather
 
@@ -33,12 +33,13 @@ Url:			http://www.google.com/webfonts/specimen/Merriweather
 Merriweather was designed to be a text face that is pleasant to read on screens.
 
 Merriweather is an evolving and will be updated. 
-As of now there are 4 styles: Regular, Light, Bold, and Black. There will also be Italic in each of these weights.
+As of now there are 4 styles: Regular, Light, Bold, and Black. There will also 
-And fairly soon after that there will also be a sans serif version which mirrors the weights and 
+be Italic in each of these weights.
-styles of the Serif design.
+And fairly soon after that there will also be a sans serif version which mirrors
+the weights and styles of the Serif design.
 
-Designed by Eben Sorkin, Merriweather features a very large x height, slightly condensed letterforms, 
+Designed by Eben Sorkin, Merriweather features a very large x height, slightly
-a mild diagonal stress, sturdy serifs and open forms.
+condensed letterforms, a mild diagonal stress, sturdy serifs and open forms.
 
 Because Merriweather is a work in progress and will be improved regularly. 
 This means you can request improvements
@@ -48,21 +49,21 @@ the Merriweather Twitter microblog.
 
 
 %prep
-%setup -n merriweather-%{version}
+%setup -n %{fontname}-%{version}
 
 
 %build
-
+# Nothing to do
 
 %install
-mkdir -p  $RPM_BUILD_ROOT/usr/share/fonts/truetype/
+mkdir -p  $RPM_BUILD_ROOT%{fontdir}
-cp *.ttf $RPM_BUILD_ROOT/usr/share/fonts/truetype/
+cp *.ttf  $RPM_BUILD_ROOT%{fontdir}
 
 %files
 %defattr(-, root, root)
 %doc METADATA FONTLOG.txt
-%dir /usr/share/fonts/truetype/
+%dir %{fontdir}
-/usr/share/fonts/truetype/*.ttf
+%{fontdir}/*.ttf
 
 
 %changelog