From ae522cc95b716323edef4bdfe35196d150468aa4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 19 2010 19:40:11 +0000
Subject: Merge remote branch 'origin/master' into f14/master


Conflicts:
	akonadi.spec

---

diff --git a/akonadi.spec b/akonadi.spec
index 95b915a..75947ba 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: 3%{?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
 
 
@@ -94,6 +96,9 @@ mkdir -p %{buildroot}%{_datadir}/akonadi/agents
 
 touch -d %{mysql_conf_timestamp} %{buildroot}%{_sysconfdir}/akonadi/mysql-local.conf
 
+# create/own %{_libdir}/akondi
+mkdir -p %{buildroot}%{_libdir}/akonadi
+
 
 %check
 # one expected failure in mock,
@@ -130,6 +135,7 @@ fi
 %{_bindir}/akonadi_rds
 %{_bindir}/akonadictl
 %{_bindir}/akonadiserver
+%{_libdir}/akonadi/
 %{_libdir}/libakonadi*.so.1*
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
@@ -148,6 +154,12 @@ fi
 
 
 %changelog
+* Tue Oct 19 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-3
+- own %%_libdir/akonadi (#644540)
+
+* 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