packages (DEVEL): akonadi/akonadi.spec - snap 1057960 - merged changes from...

[shadzik]

Author: shadzik                      Date: Thu Dec  3 17:43:05 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- snap 1057960
- merged changes from HEAD

---- Files affected:
packages/akonadi:
   akonadi.spec (1.33.2.5 -> 1.33.2.6) 

---- Diffs:

================================================================
Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.33.2.5 packages/akonadi/akonadi.spec:1.33.2.6
--- packages/akonadi/akonadi.spec:1.33.2.5	Fri Oct  9 09:26:34 2009
+++ packages/akonadi/akonadi.spec	Thu Dec  3 18:43:00 2009
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
-%define		snap		svn1032993
-%define		qtbrver		4.5.2
+%define		snap		svn1057960
+%define		qtbrver		4.6.0
 Summary:	Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):	Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:		akonadi
@@ -11,7 +11,7 @@
 #Source0:	http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
 # svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
 Source0:	%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	c37f08e705759126a3acfb3fc726073e
+# Source0-md5:	12ecff52c427abf116fe30c36e7a74ae
 Patch0:		%{name}-mysqlpath.patch
 URL:		http://pim.kde.org/akonadi/
 BuildRequires:	QtCore-devel >= %{qtbrver}
@@ -20,6 +20,7 @@
 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
@@ -28,7 +29,7 @@
 BuildRequires:	qt4-qmake >= %{qtbrver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	shared-mime-info
-BuildRequires:	soprano-devel
+BuildRequires:	soprano-devel >= 2.3.70
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	QtSql-mysql
 Requires:	mysql
@@ -139,7 +140,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libakonadiprivate.so
 %attr(755,root,root) %{_libdir}/libakonadiprotocolinternals.so
-%dir %{_libdir}/cmake
 %{_libdir}/cmake/Akonadi
 %{_includedir}/akonadi
 %{_pkgconfigdir}/akonadi.pc
@@ -150,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33.2.6  2009/12/03 17:43:00  shadzik
+- snap 1057960
+- merged changes from HEAD
+
 Revision 1.33.2.5  2009/10/09 07:26:34  paszczus
 - updated to 1.2.61 snap 1032993
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/akonadi/akonadi.spec?r1=1.33.2.5&r2=1.33.2.6&f=u