From 0b8051e134f7af87d33bd3b64f26b19e07b91c50 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 09 2010 18:46:22 +0000
Subject: - apply mysql_conf patch only for < f15


---

diff --git a/akonadi.spec b/akonadi.spec
index 95b915a..aaa0c03 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -6,7 +6,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -20,8 +20,8 @@ Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# shrink default initial db size a bit (approx 140mb->28mb)
 %define mysql_conf_timestamp 20100625
+# shrink default initial db size a bit (approx 140mb->28mb)
 Patch1: akonadi-mysql_conf.patch
 
 ## upstream patches
@@ -71,7 +71,9 @@ Requires: pkgconfig
 %prep
 %setup -q -n akonadi%{!?snap:-%{version}}
 
+%if 0%{?fedora} < 15
 %patch1 -p1 -b .mysql_conf
+%endif
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
 
@@ -148,6 +150,9 @@ fi
 
 
 %changelog
+* Sat Oct 09 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-2
+- apply mysql_conf patch only for < f15
+
 * Sat Aug 07 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-1
 - akonadi-1.4.0