From 59ed60387619c12da5c11b09e274004066b8b100 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jul 30 2008 17:00:38 +0000
Subject: - BR: mysql-server

- Requires: qt-mysql
- cleanup spec

---

diff --git a/akonadi.spec b/akonadi.spec
index 48a7f2e..67966c1 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,7 +1,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -9,17 +9,20 @@ URL:     http://download.akonadi-project.org/
 Source0:  http://akonadi.omat.nl/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
 BuildRequires: cmake
 BuildRequires: qt4-devel >= 4.4
-BuildRequires: automoc
+BuildRequires: automoc4
 BuildRequires: mysql-devel
+BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
 
+Requires: qt4-mysql
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 %description
 %{summary}.
 
@@ -36,12 +39,19 @@ Requires: pkgconfig
 %setup -q 
 
 %build
-%cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir}
-make %{?_smp_mflags}
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+  -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +84,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/libakonadi*.so
 
 %changelog
+* Wed Jul 30 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.0-2
+- BR: mysql-server
+- Requires: qt-mysql
+- cleanup spec
+
 * Wed Jul 23 2008 Than Ngo <than@redhat.com> -  1.0.0-1
 - 1.0.0