X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=akonadi.spec;h=f8c5ec4b9de574542c1c80dcde6a4a4ac3bf3dde;hb=b2e247a7e06b9cd0452c09316fb130b20737877f;hp=071dfdf9bdbf8af699958474aa4d2c34316c53d4;hpb=d71f20a9625daccb569abaf6f4fd8cb1520caf2a;p=packages%2Fakonadi.git

diff --git a/akonadi.spec b/akonadi.spec
index 071dfdf..f8c5ec4 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,28 +1,36 @@
-%define		qtbrver		4.4.0
+%define		snap		svn1057960
+%define		qtbrver		4.6.1
 Summary:	Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):	Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:		akonadi
-Version:	1.1.1
-Release:	1
+Version:	1.3.1
+Release:	4
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://akonadi.omat.nl/%{name}-%{version}.tar.bz2
-# Source0-md5:	2e98b42cec9ec4e60a2e3c096f1a3106
+Source0:	http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
+# Source0-md5:	e6eef3ed5c28d55f4b6530544e379413
+# svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
+#Source0:	%{name}-%{version}-%{snap}.tar.bz2
 URL:		http://pim.kde.org/akonadi/
 BuildRequires:	QtCore-devel >= %{qtbrver}
 BuildRequires:	QtDBus-devel >= %{qtbrver}
+BuildRequires:	QtGui-devel >= %{qtbrver}
 BuildRequires:	QtNetwork-devel >= %{qtbrver}
 BuildRequires:	QtSql-devel >= %{qtbrver}
 BuildRequires:	QtTest-devel >= %{qtbrver}
 BuildRequires:	automoc4
+BuildRequires:	boost-devel
 #BuildRequires:	clucene-core-devel >= 0.9.16a-2
 BuildRequires:	cmake >= 2.6.2
 BuildRequires:	libxslt-progs
-#BuildRequires:	mysql
 BuildRequires:	qt4-build >= %{qtbrver}
 BuildRequires:	qt4-qmake >= %{qtbrver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	shared-mime-info
+BuildRequires:	soprano-devel >= 2.4.0.1
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	QtSql-mysql
+Requires:	mysql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,7 +55,7 @@ i powiadamiania i zmianie danych.
 Summary:	Header files for Akonadi
 Summary(pl.UTF-8):	Pliki nagłówkowe dla Akonadi
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files needed to build Akonadi client libraries and
@@ -57,6 +65,17 @@ applications.
 Pliki nagłówkowe do tworzenia bibliotek klienckich i aplikacji
 używających Akonadi.
 
+%package libs
+Summary:	Akonadi libraries
+Summary(pl.UTF-8):	Biblioteki Akonadi
+Group:		Libraries
+
+%description libs
+Akonadi libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki Akonadi.
+
 %prep
 %setup -q
 
@@ -65,7 +84,7 @@ install -d build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 \
+	-DMYSQLD_EXECUTABLE=/usr/sbin/mysqld \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -82,39 +101,42 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/akonadi_control
 %attr(755,root,root) %{_bindir}/akonadictl
 %attr(755,root,root) %{_bindir}/akonadiserver
+%dir %{_datadir}/config/akonadi
+%{_datadir}/config/akonadi/mysql-global.conf
+%{_datadir}/mime/packages/akonadi-mime.xml
+
+%files libs
+%defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libakonadiprivate.so.?
 %attr(755,root,root) %{_libdir}/libakonadiprivate.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakonadiprotocolinternals.so.?
 %attr(755,root,root) %{_libdir}/libakonadiprotocolinternals.so.*.*.*
-%dir %{_datadir}/config/akonadi
-%{_datadir}/config/akonadi/mysql-global.conf
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Search.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQuery.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
-%{_datadir}/mime/packages/akonadi-mime.xml
+
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libakonadiprivate.so
 %attr(755,root,root) %{_libdir}/libakonadiprotocolinternals.so
+%{_libdir}/cmake/Akonadi
 %{_includedir}/akonadi
 %{_pkgconfigdir}/akonadi.pc