From a8fef7a3c3429ba74946bb56a295d89c353ff10c Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Dec 01 2008 00:09:34 +0000
Subject: Sync from F-10:

Mon Dec 01 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.0.0-5
- own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
Wed Oct 22 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.0-4
- drop Requires: mysql-server (for now), mention in %%description
(not building, just syncing)

---

diff --git a/akonadi.spec b/akonadi.spec
index 7a23615..628c67a 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,7 +1,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.0.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -20,13 +20,21 @@ BuildRequires: shared-mime-info
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
-Requires: qt4-mysql mysql-server
+Requires: qt4-mysql
+# not *strictly* required, leave out for now, until we have something in
+# fedora that actively uses akonadi.
+#Requires(hint): mysql-server
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
 %{summary}.
+Requires an available instance of mysql server at runtime.  
+Akonadi can spawn a per-user one automatically if the mysql-server 
+package is installed on the machine.
+See also: %{_sysconfdir}/akonadi/mysql-global.conf
+
 
 %package devel
 Summary: Developer files for %{name}
@@ -37,9 +45,11 @@ Requires: pkgconfig
 %description devel
 %{summary}.
 
+
 %prep
 %setup -q 
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -51,13 +61,17 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -66,6 +80,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS lgpl-license
@@ -78,6 +93,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/dbus-1/interfaces/
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_datadir}/mime/packages/akonadi-mime.xml
+%dir %{_datadir}/akonadi
+%dir %{_datadir}/akonadi/agents
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,13 +102,20 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/akonadi.pc
 %{_libdir}/libakonadi*.so
 
+
 %changelog
+* Mon Dec 01 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.0.0-5
+- own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
+
+* Wed Oct 22 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.0-4
+- drop Requires: mysql-server (for now), mention in %%description
+
 * Wed Jul 30 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.0-3
 - Requires: mysql-server
 
 * Wed Jul 30 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.0-2
 - BR: mysql-server
-- Requires: qt-mysql
+- Requires: qt4-mysql
 - cleanup spec
 
 * Wed Jul 23 2008 Than Ngo <than@redhat.com> -  1.0.0-1