From 4578d43dce4c779eaafb4c80da92f76cef357c14 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 5 Dec 2015 11:13:05 -0600
Subject: [PATCH] 15.08.3, backport gtalk auth fix (#1288646,kde#354949)

---
 .gitignore                                    |  3 +-
 ...x-wrongly-set-username-on-a-service-.patch | 44 +++++++++++++++++++
 kaccounts-integration.spec                    | 20 ++++++---
 sources                                       |  2 +-
 4 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch

diff --git a/.gitignore b/.gitignore
index c9f6b5e..cddde7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kaccounts-integration-15.08.1.tar.xz
-/kaccounts-integration-15.08.2.tar.xz
+/kaccounts-integration-15.08.3.tar.xz
diff --git a/0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch b/0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch
new file mode 100644
index 0000000..45c2156
--- /dev/null
+++ b/0001-createaccount-Fix-wrongly-set-username-on-a-service-.patch
@@ -0,0 +1,44 @@
+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
+
diff --git a/kaccounts-integration.spec b/kaccounts-integration.spec
index eddb436..6da271e 100644
--- a/kaccounts-integration.spec
+++ b/kaccounts-integration.spec
@@ -1,11 +1,11 @@
 #global with_akonadi 1
 
-Name:           kaccounts-integration
-Version: 15.08.2
+Name:    kaccounts-integration
+Version: 15.08.3
 Release: 1%{?dist}
-Summary:        Small system to administer web accounts across the KDE desktop
-License:        GPLv2+
-URL:            https://projects.kde.org/projects/kde/kdenetwork/kaccounts-integration
+Summary: Small system to administer web accounts across the KDE desktop
+License: GPLv2+
+URL:     https://projects.kde.org/kaccounts-integration
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -13,7 +13,10 @@ URL:            https://projects.kde.org/projects/kde/kdenetwork/kaccounts-integ
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
+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
@@ -60,7 +63,7 @@ Headers, development libraries and documentation for %{name}.
 
 
 %prep
-%setup -q -n kaccounts-integration-%{version}
+%autosetup -n kaccounts-integration-%{version} -p1
 
 
 %build
@@ -99,6 +102,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sat Dec 05 2015 Rex Dieter <rdieter@fedoraproject.org> 15.08.3-1
+- 15.08.3, backport gtalk auth fix (#1288646,kde#354949)
+
 * Wed Oct 14 2015 Rex Dieter <rdieter@fedoraproject.org> - 15.08.2-1
 - 15.08.2
 
diff --git a/sources b/sources
index e58ac10..4d5d9c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb1ef1eb94b76650d8ba274039e60f2d  kaccounts-integration-15.08.2.tar.xz
+ffefdb1009cfc113b38f860baf9f2f29  kaccounts-integration-15.08.3.tar.xz