X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=akonadi.spec;h=1e4d7ccee432ed952c66850621fa94bdfcdccde4;hb=237cfd79f6de71c43e026137c1d2a3b40156b1c9;hp=5b890c2255c1c35c4763a3596304ce3e6dcc8fd2;hpb=f63ebc394025d264e8984f540136cf95e6147adf;p=packages%2Fakonadi.git

diff --git a/akonadi.spec b/akonadi.spec
index 5b890c2..1e4d7cc 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,33 +1,34 @@
 %define		snap		svn1057960
-%define		qtbrver		4.6.1
+%define		qtver		4.8.1
 Summary:	Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):	Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:		akonadi
-Version:	1.3.90
+Version:	1.8.1
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	3536b65df3b3d5f43f55e2f72e9a0130
+Source0:	ftp://ftp.kde.org/pub/kde/stable/akonadi/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	39411abc7bec8a485362ea7460e7e3d7
 # svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
 #Source0:	%{name}-%{version}-%{snap}.tar.bz2
+Patch0:		akonadi-cleanup_orphan_resources.patch
 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:	QtCore-devel >= %{qtver}
+BuildRequires:	QtDBus-devel >= %{qtver}
+BuildRequires:	QtGui-devel >= %{qtver}
+BuildRequires:	QtNetwork-devel >= %{qtver}
+BuildRequires:	QtSql-devel >= %{qtver}
+BuildRequires:	QtTest-devel >= %{qtver}
 BuildRequires:	automoc4
 BuildRequires:	boost-devel
 #BuildRequires:	clucene-core-devel >= 0.9.16a-2
-BuildRequires:	cmake >= 2.6.2
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	libxslt-progs
-BuildRequires:	qt4-build >= %{qtbrver}
-BuildRequires:	qt4-qmake >= %{qtbrver}
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	shared-mime-info
-BuildRequires:	soprano-devel >= 2.4.0.1
+BuildRequires:	soprano-devel >= 2.4.64
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	QtSql-mysql
 Requires:	mysql
@@ -106,6 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/akonadi_agent_launcher
+%attr(755,root,root) %{_bindir}/akonadi_agent_server
 %attr(755,root,root) %{_bindir}/akonadi_control
 %attr(755,root,root) %{_bindir}/akonadi_rds
 %attr(755,root,root) %{_bindir}/akonadictl
@@ -117,13 +120,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %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.*.*.*
+%attr(755,root,root) %{_libdir}/qt4/plugins/sqldrivers/libqsqlite3.so
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.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.NotificationSource.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.Tracer.xml
@@ -134,10 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 
-
 %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