packages: akonadi/akonadi.spec - merged from DEVEL

[shadzik]

Author: shadzik                      Date: Wed Jul 29 18:44:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/akonadi:
   akonadi.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.28 packages/akonadi/akonadi.spec:1.29
--- packages/akonadi/akonadi.spec:1.28	Sun Jun 21 13:43:07 2009
+++ packages/akonadi/akonadi.spec	Wed Jul 29 20:43:59 2009
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
-%define		qtbrver		4.4.0
+%define		qtbrver		4.5.0
 Summary:	Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):	Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:		akonadi
-Version:	1.1.2
-Release:	2
+Version:	1.2.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	5651b02358f7d2f1c0954dfd31feafb1
+# Source0-md5:	4b04ab0b4670e1133307f7b82af46ce1
 URL:		http://pim.kde.org/akonadi/
 BuildRequires:	QtCore-devel >= %{qtbrver}
 BuildRequires:	QtDBus-devel >= %{qtbrver}
@@ -118,6 +118,8 @@
 %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
 
@@ -127,8 +129,23 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.28  2009/06/21 11:43:07  hawk
-- release 2
+Revision 1.29  2009/07/29 18:43:59  shadzik
+- merged from DEVEL
+
+Revision 1.27.2.5  2009/07/29 18:37:15  arekm
+- up to 1.2.0
+
+Revision 1.27.2.4  2009/06/30 07:26:21  shadzik
+- 1.1.95
+
+Revision 1.27.2.3  2009/06/29 17:33:50  shadzik
+- %dir
+
+Revision 1.27.2.2  2009/06/08 10:45:03  paszczus
+- updated to 1.1.90
+
+Revision 1.27.2.1  2009/05/11 18:24:10  shadzik
+- 4.2.85
 
 Revision 1.27  2009/04/30 20:03:17  arekm
 - up to 1.1.2
================================================================

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