Accepting request 450756 from KDE:Applications

KDE Applications 16.12.1

OBS-URL: https://build.opensuse.org/request/show/450756
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kgpg?expand=0&rev=68

0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch

@@ -1,34 +0,0 @@
-From ac2ca301c6ef2d02810b762c618f1ce504382c4e Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <kde@opensource.sf-tec.de>
-Date: Tue, 3 Jan 2017 22:46:11 +0100
-Subject: [PATCH 1/3] fix crash when GnuPG does not output curve fields for
- keys, take 3
-
-secret keys, it is.
-
-BUG:374509
-CCBUGS:371410,373408
-FIXED-IN:16.12.1
----
- kgpginterface.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kgpginterface.cpp b/kgpginterface.cpp
-index 6d87093..7c760c0 100644
---- a/kgpginterface.cpp
-+++ b/kgpginterface.cpp
-@@ -342,9 +342,10 @@ readSecretKeysProcess(GPGProc &p)
- 				keytype = Convert::toSubType(caps, true);
- 			}
- 
-+			const QString curve = (items > 16) ? lsp.at(16) : QString();
- 			result << KgpgKey(lsp.at(4), lsp.at(2).toUInt(), Convert::toTrust(lsp.at(1)),
- 				Convert::toAlgo(lsp.at(3)), subtype, keytype,
--				QDateTime::fromTime_t(lsp.at(5).toUInt()), lsp.at(16));
-+				QDateTime::fromTime_t(lsp.at(5).toUInt()), curve);
- 
- 			secretkey = &result.last();
- 
--- 
-2.10.2
-

kgpg-16.12.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a0f5128919f0082be9b6818f095029abe1380976598ee30b9bc47e1480ec5ca
-size 817664

kgpg-16.12.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1ceff0da8f69049d669e6c5c3c7267e56d4c28012f49e862980451b1396c821
+size 817640

kgpg-autostart.diff

@@ -1,6 +1,6 @@
 --- org.kde.kgpg.desktop	2008/07/21 09:57:19	1.1
 +++ org.kde.kgpg.desktop	2008/07/21 09:57:26
-@@ -118,3 +118,4 @@
+@@ -219,3 +219,4 @@
  X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
  
  Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;

kgpg.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org
+
+- - Update to KDE Applications 16.12.1
+   * KDE Applications 16.12.1 
+   * https://www.kde.org/announcements/announce-applications-16.12.1.php
+
+- Drop 0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch,
+  included in this release
+
 -------------------------------------------------------------------
 Fri Jan  6 01:17:01 UTC 2017 - wbauer@tmo.at
 

kgpg.spec

@@ -17,10 +17,10 @@
 
 
 Name:           kgpg
-Version:        16.12.0
+Version:        16.12.1
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA)
+# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %ix86 x86_64 %arm aarch64 mips mips64
@@ -32,9 +32,8 @@ Source0:        kgpg-%{version}.tar.xz
 Patch1:         kgpg-autostart.diff
 Patch2:         fix-build-gcc48.patch
 # The following patches are from upstream and added on the upstream maintainers request, see https://build.opensuse.org/request/show/448937
-Patch3:         0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch
+Patch3:         0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch
-Patch4:         0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch
+Patch4:         0003-Revert-Increase-KF5-requirement.patch
-Patch5:         0003-Revert-Increase-KF5-requirement.patch
 BuildRequires:  akonadi-contact-devel
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules
@@ -69,7 +68,6 @@ Kgpg is a simple GUI for gpg
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %cmake_kf5 -d build