packages: akonadi/akonadi.spec - 1.3.0 merged from DEVEL

[shadzik]

Author: shadzik                      Date: Sun Jan 31 23:20:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.3.0 merged from DEVEL

---- Files affected:
packages/akonadi:
   akonadi.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.40 packages/akonadi/akonadi.spec:1.41
--- packages/akonadi/akonadi.spec:1.40	Thu Dec 31 09:56:49 2009
+++ packages/akonadi/akonadi.spec	Mon Feb  1 00:20:05 2010
@@ -1,14 +1,17 @@
 # $Revision$, $Date$
-%define		qtbrver		4.5.0
+%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
-Version:	1.2.1
-Release:	3
+Version:	1.3.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	f9c1d000844f31c67360078ddf60bec2
+# Source0-md5:	45fe59bd301268149cb0313d54a98520
+# svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
+#Source0:	%{name}-%{version}-%{snap}.tar.bz2
 Patch0:		%{name}-mysqlpath.patch
 URL:		http://pim.kde.org/akonadi/
 BuildRequires:	QtCore-devel >= %{qtbrver}
@@ -26,10 +29,10 @@
 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:	mysql
 Requires:	QtSql-mysql
+Requires:	mysql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,7 +80,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 install -d build
@@ -122,18 +125,17 @@
 %{_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.Tracer.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
 %{_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.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.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
@@ -148,27 +150,43 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.40  2009/12/31 08:56:49  arekm
-- rel 3
+Revision 1.41  2010/01/31 23:20:05  shadzik
+- 1.3.0 merged from DEVEL
+
+Revision 1.33.2.11  2010/01/20 09:35:54  arekm
+- up to 1.3.0
+
+Revision 1.33.2.10  2010/01/15 19:49:56  arekm
+- revert S: virtuoso; it belongs to soprano
+
+Revision 1.33.2.9  2010/01/15 19:26:03  arekm
+S: virtuoso as noted in http://websvn.kde.org/trunk/KDE/kdepim/README.packagers?view=markup
+
+Revision 1.33.2.8  2010/01/11 21:44:03  arekm
+- up to 1.2.90
+
+Revision 1.33.2.7  2009/12/03 20:30:43  shadzik
+- 1.2.80 (official tarball)
 
-Revision 1.39  2009/11/22 00:17:28  sparky
-- BR: boost-devel
+Revision 1.33.2.6  2009/12/03 17:43:00  shadzik
+- snap 1057960
+- merged changes from HEAD
 
-Revision 1.38  2009/11/22 00:01:42  sparky
-- %{_libdir}/cmake dir does not belong here
+Revision 1.33.2.5  2009/10/09 07:26:34  paszczus
+- updated to 1.2.61 snap 1032993
 
-Revision 1.37  2009/09/02 09:54:14  cactus
-- rel 2; rebuild with boost
+Revision 1.33.2.4  2009/08/25 17:35:04  paszczus
+- merged changes from HEAD
 
-Revision 1.36  2009/08/29 10:16:51  arekm
-- up to 1.2.1
+Revision 1.33.2.3  2009/08/25 10:15:06  cactus
+- up to 1.2.61 svn 1015328
+- svn adress added
 
-Revision 1.35  2009/08/28 22:47:58  arekm
-- release 7
+Revision 1.33.2.2  2009/08/19 22:57:47  cactus
+- adapterized
 
-Revision 1.34  2009/08/25 17:22:17  shadzik
-- move all dbus files to -libs
-- rel 6
+Revision 1.33.2.1  2009/08/19 22:50:22  cactus
+- up to 1.2.60 svn1013447
 
 Revision 1.33  2009/08/11 12:10:22  shadzik
 - separate libs and .xmls needed to build kde4-kdepimlibs to -libs subpackage
================================================================

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