From 5c9bef6a94878d873dc7e46f6ed0d7ca4c15ce8a2ef8bbe3cc9d8740139293e8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 11 Aug 2017 22:51:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/akonadi-contact?expand=0&rev=52

---
 akonadi-contact.changes |  9 +++++++++
 akonadi-contact.spec    | 27 +++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/akonadi-contact.changes b/akonadi-contact.changes
index 24e5b53..0cec362 100644
--- a/akonadi-contact.changes
+++ b/akonadi-contact.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug 11 22:44:44 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.08.0
+  * New feature release
+  * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+- Too many changes to list here
+
 -------------------------------------------------------------------
 Sat Aug  5 18:16:23 UTC 2017 - christophe@krop.fr
 
diff --git a/akonadi-contact.spec b/akonadi-contact.spec
index c7e5389..074eb65 100644
--- a/akonadi-contact.spec
+++ b/akonadi-contact.spec
@@ -23,7 +23,7 @@ Name:           akonadi-contact
 Version:        17.07.90
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        KDE PIM Libraries for Akonadi Contacts
 License:        LGPL-2.1+
@@ -32,7 +32,6 @@ Url:            http://www.kde.org
 Source:         akonadi-contacts-%{version}.tar.xz
 BuildRequires:  akonadi-mime-devel
 BuildRequires:  akonadi-server-devel >= %{_kapp_version}
-BuildRequires:  cmake(KF5Prison)
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  grantlee5-devel
 BuildRequires:  kcalcore-devel
@@ -43,15 +42,18 @@ BuildRequires:  kf5-filesystem
 BuildRequires:  kio-devel >= %{kf5_version}
 BuildRequires:  kmime-devel
 BuildRequires:  pkgconfig
+BuildRequires:  cmake(KF5Prison)
 BuildRequires:  pkgconfig(Qt5Test) >= 5.6.0
 BuildRequires:  pkgconfig(Qt5WebEngine) >= 5.6.0
 BuildRequires:  pkgconfig(Qt5WebEngineWidgets) >= 5.6.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.6.0
 Requires:       libKF5AkonadiContact5 = %{version}
 Requires:       libKF5ContactEditor5 = %{version}
-Recommends:     %{name}-lang
 Provides:       akonadi-contacts = %{version}
 Obsoletes:      akonadi-contacts < %{version}
+%if %{with lang}
+Recommends:     %{name}-lang
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
@@ -84,9 +86,9 @@ as part of the KDE Personal Information Management (PIM) software.
 %package devel
 Summary:        KDE PIM Libraries: Build Environment
 Group:          Development/Libraries/KDE
+Requires:       akonadi-contact = %{version}
 Requires:       akonadi-server-devel
 Requires:       kcontacts-devel
-Requires:       akonadi-contact = %{version}
 Requires:       libKF5AkonadiContact5 = %{version}
 Requires:       libKF5ContactEditor5 = %{version}
 Obsoletes:      akonadi-contacts-devel < %{version}
@@ -122,17 +124,20 @@ to develop KDE PIM applications.
 %files
 %defattr(-,root,root)
 %doc COPYING*
-%config %{_kf5_configdir}/*.categories
 %dir %{_kf5_plugindir}
 %dir %{_kf5_plugindir}/akonadi/contacts/
 %dir %{_kf5_servicesdir}/akonadi
+%dir %{_kf5_servicesdir}/akonadi/contact
+%dir %{_kf5_sharedir}/contacteditor/
+%dir %{_kf5_sharedir}/contacteditor/grantleetheme/
+%config %{_kf5_configdir}/*.categories
 %{_kf5_datadir}/akonadi/contact/
 %{_kf5_plugindir}/akonadi/contacts/plugins/
 %{_kf5_plugindir}/kcm_akonadicontact_actions.so
 %{_kf5_servicesdir}/akonadi/contact/
 %{_kf5_servicesdir}/akonadicontact_actions.desktop
 %{_kf5_servicetypesdir}/kaddressbookimprotocol.desktop
-%{_kf5_sharedir}/contacteditor/
+%{_kf5_sharedir}/contacteditor/grantleetheme/default/
 
 %files -n libKF5AkonadiContact5
 %defattr(-,root,root)
@@ -148,13 +153,15 @@ to develop KDE PIM applications.
 %defattr(-,root,root)
 %doc COPYING*
 %dir %{_kf5_includedir}/Akonadi
+%dir %{_kf5_includedir}/ContactEditor
 %dir %{_kf5_includedir}/akonadi
+%dir %{_kf5_includedir}/contacteditor
 %{_kf5_includedir}/Akonadi/Contact/
-%{_kf5_includedir}/ContactEditor/
+%{_kf5_includedir}/ContactEditor
 %{_kf5_includedir}/akonadi/contact/
-%{_kf5_includedir}/contacteditor/
-%{_kf5_libdir}/cmake/KF5AkonadiContact/
-%{_kf5_libdir}/cmake/KF5ContactEditor/
+%{_kf5_includedir}/contacteditor
+%{_kf5_cmakedir}/KF5AkonadiContact/
+%{_kf5_cmakedir}/KF5ContactEditor/
 %{_kf5_libdir}/libKF5AkonadiContact.so
 %{_kf5_libdir}/libKF5ContactEditor.so
 %{_kf5_mkspecsdir}/qt_AkonadiContact.pri