rpms/akonadi/F-9 akonadi.spec,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14294

Modified Files:
	akonadi.spec 
Log Message:
* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-2
- BR: mysql-server
- Requires: qt-mysql
- cleanup spec



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akonadi.spec	23 Jul 2008 10:29:26 -0000	1.2
+++ akonadi.spec	30 Jul 2008 16:59:22 -0000	1.3
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/libakonadi*.so
 
 %changelog
+* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-2
+- BR: mysql-server
+- Requires: qt-mysql
+- cleanup spec
+
 * Wed Jul 23 2008 Than Ngo <than at redhat.com> -  1.0.0-1
 - 1.0.0