From 597313bbb31a57da66b2fbe7a1d9f68428f540aa681a9fce2b3fb39778a6960c Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Wed, 27 Apr 2016 21:42:05 +0000
Subject: [PATCH] - Move dbus xml files to the akonadi-devel package - Make the
 devel package conflict with   libakonadiprotocolinternals-devel

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=35
---
 akonadi-server.changes |  7 +++++++
 akonadi-server.spec    | 37 +++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/akonadi-server.changes b/akonadi-server.changes
index 3013776..8542625 100644
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 27 21:40:31 UTC 2016 - lbeltrame@kde.org
+
+- Move dbus xml files to the akonadi-devel package
+- Make the devel package conflict with 
+  libakonadiprotocolinternals-devel
+
 -------------------------------------------------------------------
 Sun Apr 17 05:48:49 UTC 2016 - tittiatcoke@gmail.com
 
diff --git a/akonadi-server.spec b/akonadi-server.spec
index 68ea531..220f412 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -28,28 +28,28 @@ Source:         %{rname}-%{version}.tar.xz
 Source99:       akonadi-server-rpmlintrc
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8.9
+BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  libxml2
 BuildRequires:  libxslt
-BuildRequires:  mariadb
-BuildRequires:  shared-mime-info
-BuildRequires:  sqlite3-devel
-BuildRequires:  postgresql-devel
-BuildRequires:  extra-cmake-modules
-BuildRequires:  cmake(KF5ItemViews)
-BuildRequires:  cmake(KF5KIO)
-BuildRequires:  cmake(KF5Config)
-BuildRequires:  cmake(KF5I18n)
-BuildRequires:  cmake(KF5DesignerPlugin)
-BuildRequires:  cmake(KF5DBusAddons)
-BuildRequires:  cmake(KF5ItemModels)
-BuildRequires:  cmake(KF5GuiAddons)
-BuildRequires:  cmake(KF5IconThemes)
-BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(KF5Completion)
-BuildRequires:  cmake(Qt5Designer)
 BuildRequires:  libxslt-devel
 BuildRequires:  libxslt-tools
+BuildRequires:  mariadb
+BuildRequires:  postgresql-devel
+BuildRequires:  shared-mime-info
+BuildRequires:  sqlite3-devel
+BuildRequires:  cmake(KF5Completion)
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5DBusAddons)
+BuildRequires:  cmake(KF5DesignerPlugin)
+BuildRequires:  cmake(KF5GuiAddons)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5IconThemes)
+BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5ItemViews)
+BuildRequires:  cmake(KF5KIO)
+BuildRequires:  cmake(KF5WindowSystem)
+BuildRequires:  cmake(Qt5Designer)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -88,6 +88,7 @@ Group:          Development/Libraries/X11
 Requires:       %{name} = %{version}
 Obsoletes:      libKF5AkonadiPrivate-devel < %{version}
 Provides:       libKF5AkonadiPrivate-devel = %{version}
+Conflicts:      libakonadiprotocolinternals-devel
 
 %description devel
 This package contains development files of Akonadi, the KDE PIM storage
@@ -120,7 +121,6 @@ service.
 %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf
 %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
 %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
-%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
 %{_kf5_sharedir}/mime/packages/akonadi-mime.xml
 %{_kf5_plugindir}/sqldrivers/libqsqlite3.so
 %{_datadir}/kf5/akonadi/
@@ -146,6 +146,7 @@ service.
 %dir %{_kf5_libdir}/cmake
 %{_kf5_libdir}/cmake/KF5Akonadi
 %{_kf5_includedir}/akonadi_version.h
+%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
 %{_libdir}/libKF5AkonadiPrivate.so
 %{_libdir}/libKF5AkonadiCore.so
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri