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

[paszczus]

Author: paszczus                     Date: Tue Aug 25 17:35:09 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged changes from HEAD

---- Files affected:
packages/akonadi:
   akonadi.spec (1.33.2.3 -> 1.33.2.4) 

---- Diffs:

================================================================
Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.33.2.3 packages/akonadi/akonadi.spec:1.33.2.4
--- packages/akonadi/akonadi.spec:1.33.2.3	Tue Aug 25 12:15:06 2009
+++ packages/akonadi/akonadi.spec	Tue Aug 25 19:35:04 2009
@@ -48,9 +48,9 @@
 w wersji 4.1 i nowszych. Działa jako rozszerzalny system
 przechowywania danych dla wszystkich aplikacji PIM.
 
-Poza przechowywaniem danych Akonadi ma kilka innych komponentów, w
-tym wyszukiwanie oraz bibliotekę (pamięć podręczną) w celu
-łatwego dostępu i powiadamiania i zmianie danych.
+Poza przechowywaniem danych Akonadi ma kilka innych komponentów, w tym
+wyszukiwanie oraz bibliotekę (pamięć podręczną) w celu łatwego dostępu
+i powiadamiania i zmianie danych.
 
 %package devel
 Summary:	Header files for Akonadi
@@ -113,15 +113,6 @@
 %attr(755,root,root) %{_bindir}/akonadiserver
 %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.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
 %{_datadir}/mime/packages/akonadi-mime.xml
 
 %files libs
@@ -136,6 +127,16 @@
 %{_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)
@@ -152,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33.2.4  2009/08/25 17:35:04  paszczus
+- merged changes from HEAD
+
 Revision 1.33.2.3  2009/08/25 10:15:06  cactus
 - up to 1.2.61 svn 1015328
 - svn adress added
================================================================

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