From 74b95fe919403def1824b420c750fca32fc9b62aee9814c07f743e2e510a652e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 14 Jan 2017 08:56:16 +0000 Subject: [PATCH 1/8] update to (16.12.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=45 --- kgpg-16.12.0.tar.xz | 3 --- kgpg-16.12.1.tar.xz | 3 +++ kgpg.changes | 7 +++++++ kgpg.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 kgpg-16.12.0.tar.xz create mode 100644 kgpg-16.12.1.tar.xz diff --git a/kgpg-16.12.0.tar.xz b/kgpg-16.12.0.tar.xz deleted file mode 100644 index 1277538..0000000 --- a/kgpg-16.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a0f5128919f0082be9b6818f095029abe1380976598ee30b9bc47e1480ec5ca -size 817664 diff --git a/kgpg-16.12.1.tar.xz b/kgpg-16.12.1.tar.xz new file mode 100644 index 0000000..f274e45 --- /dev/null +++ b/kgpg-16.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1ceff0da8f69049d669e6c5c3c7267e56d4c28012f49e862980451b1396c821 +size 817640 diff --git a/kgpg.changes b/kgpg.changes index ba6523c..7fbd4ee 100644 --- a/kgpg.changes +++ b/kgpg.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org + +- - Update to KDE Applications 16.12.0 + * KDE Applications 16.12.0 + * https://www.kde.org/announcements/announce-applications-16.12.0.php + ------------------------------------------------------------------- Fri Jan 6 01:17:01 UTC 2017 - wbauer@tmo.at diff --git a/kgpg.spec b/kgpg.spec index 604b29f..6f9c743 100644 --- a/kgpg.spec +++ b/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 From 52900e7dab70b8ecf3925ace4e105be3fdf4145bbe65f257c3e4988fea12b0c7 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 14 Jan 2017 10:33:51 +0000 Subject: [PATCH 2/8] Fixup version number OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=46 --- kgpg.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kgpg.changes b/kgpg.changes index 7fbd4ee..9e80798 100644 --- a/kgpg.changes +++ b/kgpg.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org -- - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 - * https://www.kde.org/announcements/announce-applications-16.12.0.php +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Fri Jan 6 01:17:01 UTC 2017 - wbauer@tmo.at From ad3dca3637a756c1f590c86bd5d9a5a07e9017921cd6565390d84f4c03f34e6b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:24:13 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=47 --- kgpg.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kgpg.spec b/kgpg.spec index 6f9c743..c776ddb 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -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 -Patch4: 0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch -Patch5: 0003-Revert-Increase-KF5-requirement.patch +Patch3: 0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch +Patch4: 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 From b1a6c8715ddaefac4ae28abb86a98d6bb78a96c8032f0fc131384902eac1cf96 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:24:25 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=48 --- ...nuPG-does-not-output-curve-fields-fo.patch | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch diff --git a/0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch b/0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch deleted file mode 100644 index 9d5c7e1..0000000 --- a/0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ac2ca301c6ef2d02810b762c618f1ce504382c4e Mon Sep 17 00:00:00 2001 -From: Rolf Eike Beer -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 - From 60d41aadb9a31a5f722e45c1d378487549175ad9da0e711056cec59c18964edd Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:32:25 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=49 --- kgpg.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kgpg.changes b/kgpg.changes index 9e80798..5b97d9d 100644 --- a/kgpg.changes +++ b/kgpg.changes @@ -5,6 +5,9 @@ Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org * 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 From d6281f68e692491f11320f4101545188223e14a0008a1e18dd36b4bfa9aa2a96 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:35:40 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=50 --- kgpg-autostart.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kgpg-autostart.diff b/kgpg-autostart.diff index 543689c..fa13a97 100644 --- a/kgpg-autostart.diff +++ b/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@@ X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; From b1b2118fc0103df2c0e9ee5f3ed579820154998e51547ac5fb2e05d0e83c2d42 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:35:48 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=51 --- kgpg-autostart.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kgpg-autostart.diff b/kgpg-autostart.diff index fa13a97..31c009b 100644 --- a/kgpg-autostart.diff +++ b/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 -@@ -219,3 +219@@ +@@ -219,3 +219,4 X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; From 50f1d9a9ad23972311484f154e479a2c4ad89f2a93ef49bcb80131ddbcefe270 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 15 Jan 2017 11:36:31 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=52 --- kgpg-autostart.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kgpg-autostart.diff b/kgpg-autostart.diff index 31c009b..7504d49 100644 --- a/kgpg-autostart.diff +++ b/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 -@@ -219,3 +219,4 +@@ -219,3 +219,4 @@ X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;