From cb985a1ad926c655bfbbc51ef7f88d928020cae7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sun, 10 Jul 2016 07:39:28 -0500
Subject: [PATCH] 16.04.3-2

- fix KAccountsConfig to not make any assumptions about relative/full paths
- drop akonadi conditionals
---
 ...integration-16.04.3-cmakeconfig_path.patch |  9 ++++++++
 kaccounts-integration.spec                    | 22 +++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 kaccounts-integration-16.04.3-cmakeconfig_path.patch

diff --git a/kaccounts-integration-16.04.3-cmakeconfig_path.patch b/kaccounts-integration-16.04.3-cmakeconfig_path.patch
new file mode 100644
index 0000000..b9e1477
--- /dev/null
+++ b/kaccounts-integration-16.04.3-cmakeconfig_path.patch
@@ -0,0 +1,9 @@
+diff -up kaccounts-integration-16.04.3/src/lib/KAccountsConfig.cmake.in.path kaccounts-integration-16.04.3/src/lib/KAccountsConfig.cmake.in
+--- kaccounts-integration-16.04.3/src/lib/KAccountsConfig.cmake.in.path	2016-07-02 11:13:43.000000000 -0500
++++ kaccounts-integration-16.04.3/src/lib/KAccountsConfig.cmake.in	2016-07-10 07:35:51.037019206 -0500
+@@ -9,4 +9,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/FindA
+ include("${CMAKE_CURRENT_LIST_DIR}/KAccountsTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KAccountsMacros.cmake")
+ 
+-set(KACCOUNTS_MACROS_PATH "@CMAKE_INSTALL_PREFIX@/@CMAKECONFIG_INSTALL_DIR@")
++set(KACCOUNTS_MACROS_PATH "@KDE_INSTALL_FULL_CMAKEPACKAGEDIR@/KAccounts")
diff --git a/kaccounts-integration.spec b/kaccounts-integration.spec
index db912e8..a7656bf 100644
--- a/kaccounts-integration.spec
+++ b/kaccounts-integration.spec
@@ -1,8 +1,7 @@
-#global with_akonadi 1
 
 Name:    kaccounts-integration
 Version: 16.04.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Small system to administer web accounts across the KDE desktop
 License: GPLv2+
 URL:     https://quickgit.kde.org/?p=%{name}.git
@@ -17,6 +16,10 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%
 
 ## upstream fixes
 
+## upstreamable fixes
+# fix KAccountsConfig to not make any assumptions about relative/full paths
+Patch100: kaccounts-integration-16.04.3-cmakeconfig_path.patch
+
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  kf5-kcmutils-devel
@@ -29,9 +32,6 @@ BuildRequires:  kf5-kiconthemes-devel
 BuildRequires:  kf5-kconfig-devel
 BuildRequires:  kf5-kwallet-devel
 BuildRequires:  kf5-kdbusaddons-devel
-%if 0%{?with_akonadi}
-BuildRequires:  kf5-akonadi-devel
-%endif
 
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Qml)
@@ -40,8 +40,7 @@ BuildRequires:  pkgconfig(accounts-qt5) >= 1.13
 BuildRequires:  pkgconfig(libaccounts-glib) >= 1.21
 BuildRequires:  pkgconfig(libsignon-qt5) >= 8.55
 
-Requires:       signon
-Requires:       signon-plugin-oauth2
+Requires:       signon-plugin-oauth2%{?_isa}
 
 Obsoletes:      kaccounts < 15.03
 Provides:       kaccounts = %{version}-%{release}
@@ -88,12 +87,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_datadir}/kservices5/kcm_kaccounts.desktop
 %{_kf5_qtplugindir}/kded_accounts.so
 %{_kf5_datadir}/kservices5/kded/accounts.desktop
-%{_kf5_libdir}/libkaccounts.so.1*
+%{_kf5_libdir}/libkaccounts.so.1
 %{_kf5_libdir}/libkaccounts.so.%{version}
 %{_kf5_qmldir}/org/kde/kaccounts/
-%if 0%{?with_akonadi}
-%{_kf5_qtplugindir}/kaccounts/daemonplugins/kaccounts_akonadi_plugin.so
-%endif
 
 %files devel
 %{_kf5_libdir}/libkaccounts.so
@@ -102,6 +98,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Jul 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 16.04.3-2
+- fix KAccountsConfig to not make any assumptions about relative/full paths
+- drop akonadi conditionals
+
 * Sat Jul 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 16.04.3-1
 - 16.04.3