[vollkorn-fonts] Upstream release with more styles

[Paul Flo Williams]

commit 2747e7570c112f38e41cd9fd5642c9249b6caf7e
Author: Paul Flo Williams <paul at frixxon.co.uk>
Date:   Tue Jul 24 08:59:54 2012 +0100

    Upstream release with more styles

 .gitignore          |    1 +
 sources             |    3 +--
 vollkorn-fonts.spec |   46 ++++++++++++++++++++++++----------------------
 3 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f22d141..da115ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Vollkorn.pdf
 vollkorn.otf
+/Vollkorn-2.1.zip
diff --git a/sources b/sources
index fd6e873..ceb037b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b06f4d12d6640399ea943deb84d36ca9  Vollkorn.pdf
-ae1ff36998848463c56bb74bebcced6f  vollkorn.otf
+dd38725c293bc73774ff77744674fe13  Vollkorn-2.1.zip
diff --git a/vollkorn-fonts.spec b/vollkorn-fonts.spec
index 581500b..f111d5e 100644
--- a/vollkorn-fonts.spec
+++ b/vollkorn-fonts.spec
@@ -1,36 +1,37 @@
-%define fontname vollkorn
-%define fontconf 64-%{fontname}.conf
-
-%define archivename Vollkorn
+%global fontname vollkorn
+%global fontconf 64-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        1.008
-Release:        7%{?dist}
-Summary:        A serif latin font with good readability
+Version:        2.1
+Release:        1%{?dist}
+Summary:        A serif Latin font with good readability
 
 Group:          User Interface/X
-License:        CC-BY
-URL:            http://www.grafikfritze.de/?p=43
-#http://www.grafikfritze.de/download.php?download=1
-Source0:        %{fontname}.otf  
+License:        OFL
+URL:            http://friedrichalthausen.de/?page_id=411
+Source0:        http://friedrichalthausen.de/Vollkorn-%{version}.zip
 Source1:        %{name}-fontconfig.conf
-Source2:        %{archivename}.pdf
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 
 %description
-Serif latin OTF font by Friedrich Althausen with focus on good readability.
+Serif Latin font by Friedrich Althausen with focus on good readability.
 Because of this it is relatively dark and strong and has emphasized serifs. 
-Vollkorn will especially work good in reading-sizes with its familiar and 
+Vollkorn will especially work well in body type sizes with its familiar and 
 smooth overall picture.
 
 %prep
 %setup -q -c -T
-install -m 0644 -p %{SOURCE2} .
-
+unzip -j -L -q %{SOURCE0}
+for file in *.txt ; do
+ sed 's|\r||g' "$file" | fold -s > "$file.new" && \
+ touch -r "$file" "$file.new" && \
+ mv "$file.new" "$file"
+done
+
+ 
 %build
 
 
@@ -38,7 +39,7 @@ install -m 0644 -p %{SOURCE2} .
 rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
@@ -53,14 +54,15 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 rm -fr %{buildroot}
 
 
-%_font_pkg -f %{fontconf} *.otf
+%_font_pkg -f %{fontconf} *.ttf
 
-%doc *.pdf
-
-%dir %{_fontdir}
+%doc *.txt
 
 
 %changelog
+* Mon Jul 23 2012 Paul Flo Williams <paul at frixxon.co.uk> - 2.1-1
+- New upstream release with added styles
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.008-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild