From 1dee75842cefff91792faaa7661323837b355a1b Mon Sep 17 00:00:00 2001
From: Ian Weller <ian@ianweller.org>
Date: Jul 30 2011 02:37:21 +0000
Subject: Merge branch 'f15' into f14


Conflicts:
	.gitignore
	abattis-cantarell-fonts.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index f344959..bd2c2e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 /cantarell-fonts-0.0.1.tar.bz2
 /cantarell-fonts-0.0.3.tar.bz2
+/cantarell-fonts-0.0.4.tar.bz2
+/cantarell-fonts-0.0.5.tar.bz2
+/cantarell-fonts-0.0.6.tar.bz2
diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec
index 0822cef..590fb8b 100644
--- a/abattis-cantarell-fonts.spec
+++ b/abattis-cantarell-fonts.spec
@@ -7,7 +7,7 @@
 %global archivename2 Cantarell-Regular
 
 Name: %{fontname}-fonts
-Version: 0.0.3
+Version: 0.0.6
 Release: 1%{?dist}
 Summary: Cantarell, a Humanist sans-serif font family
 
@@ -16,15 +16,14 @@ License: OFL
 URL: http://abattis.org/cantarell/
 Source0: http://download.gnome.org/sources/%{actualname}-fonts/0.0/%{actualname}-fonts-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: fontpackages-devel
 BuildRequires: fontforge
 Requires: fontpackages-filesystem
 
 %description
-Cantarell is a set of fonts designed by Dave Crossland. It is a 
-sans-serif humanist typeface family.
+Cantarell is a set of fonts designed by Dave Crossland.
+It is a sans-serif humanist typeface family.
 
 %prep
 %setup -q -n %{actualname}-fonts-%{version}
@@ -48,12 +47,18 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 %_font_pkg -f %{fontconf} *.otf
-%doc COPYING NEWS README 
-
-%clean
-rm -rf %{buildroot}
+%doc COPYING NEWS README
 
 %changelog
+* Mon Apr  4 2011 Christopher Aillon <caillon@redhat.com> - 0.0.6-1
+- Update to 0.0.6
+
+* Tue Mar 22 2011 Cosimo Cecchi <cosimoc@redhat.com> - 0.0.5-1
+- Update to 0.0.5
+
+* Mon Mar  7 2011 Matthias Clasen <mclasen@redhat.com> - 0.0.4-1
+- Update to 0.0.4
+
 * Mon Feb 21 2011 Cosimo Cecchi <cosimoc@redhat.com> - 0.0.3-1
 - Update to 0.0.3
 
diff --git a/sources b/sources
index 01d93a8..0a97497 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8fa9efd26ada192ec337f9f7b7465b5  cantarell-fonts-0.0.3.tar.bz2
+0b3dab5f0eede6d50b0b89401cadc758  cantarell-fonts-0.0.6.tar.bz2