15.12.0

.gitignore

@@ -1 +1 @@
-/kaccounts-integration-15.08.3.tar.xz
+/kaccounts-integration-15.12.0.tar.xz

0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch

@@ -1,44 +0,0 @@
-From fcc6aa7dd630cf6be1a2085426920ad9bbb2b57a Mon Sep 17 00:00:00 2001
-From: Georgy Kirichenko <kirichenkoga@gmail.com>
-Date: Fri, 4 Dec 2015 14:00:36 -0500
-Subject: [PATCH] [createaccount] Fix wrongly set username on a service instead
- of account
-
-BUG: 354949
-FIXED-IN: 15.12.0
----
- src/jobs/createaccount.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/jobs/createaccount.cpp b/src/jobs/createaccount.cpp
-index b55264b..22aff1b 100644
---- a/src/jobs/createaccount.cpp
-+++ b/src/jobs/createaccount.cpp
-@@ -141,8 +141,8 @@ void CreateAccount::pluginFinished(const QString &screenName, const QString &sec
- 
-     m_done = true;
- 
--    m_identity->storeCredentials();
-     connect(m_identity, &SignOn::Identity::credentialsStored, m_identity, &SignOn::Identity::queryInfo);
-+    m_identity->storeCredentials();
- }
- 
- void CreateAccount::pluginError(const QString &error)
-@@ -177,12 +177,12 @@ void CreateAccount::info(const SignOn::IdentityInfo &info)
-         return;
-     }
- 
-+    m_account->selectService();
-+
-     if (m_account->displayName().isEmpty()) {
-         m_account->setDisplayName(info.userName());
-     }
-     m_account->setValue("username", info.userName());
--
--    m_account->selectService();
-     m_account->setCredentialsId(info.id());
- 
-     Accounts::AuthData authData = m_accInfo->authData();
--- 
-2.5.0
-

kaccounts-integration.spec

@@ -1,7 +1,7 @@
 #global with_akonadi 1
 
 Name:    kaccounts-integration
-Version: 15.08.3
+Version: 15.12.0
 Release: 1%{?dist}
 Summary: Small system to administer web accounts across the KDE desktop
 License: GPLv2+
@@ -16,7 +16,6 @@ URL:     https://projects.kde.org/kaccounts-integration
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstream fixes
-Patch1: 0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch
 
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
@@ -102,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> - 15.12.0-1
+- 15.12.0
+
 * Sat Dec 05 2015 Rex Dieter <rdieter@fedoraproject.org> 15.08.3-1
 - 15.08.3, backport gtalk auth fix (#1288646,kde#354949)
 

sources

@@ -1 +1 @@
-ffefdb1009cfc113b38f860baf9f2f29  kaccounts-integration-15.08.3.tar.xz
+6ae85de02ca89f16f2daa9f8367dc528  kaccounts-integration-15.12.0.tar.xz