Hello community, here is the log from the commit of package seahorse for openSUSE:Factory checked in at 2018-01-19 11:48:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seahorse (Old) and /work/SRC/openSUSE:Factory/.seahorse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seahorse" Fri Jan 19 11:48:30 2018 rev:102 rq:566729 version:3.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/seahorse/seahorse.changes 2016-06-03 16:32:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.seahorse.new/seahorse.changes 2018-01-19 11:48:48.472097964 +0100 @@ -1,0 +2,9 @@ +Mon Jan 15 21:28:58 UTC 2018 - [email protected] + +- Add seahorse-gpg-ignore-key-considered.patch: ignore new + key_considered line (bgo#779607). +- Add seahorse-new-gnupg.patch: Mark gnupg 2.2.x as supported, so + that our builds enable gpg again (bsc#1075928). +- Drop seahorse-allow-deprecated.patch: seahorse builds without it. + +------------------------------------------------------------------- Old: ---- seahorse-allow-deprecated.patch New: ---- seahorse-gpg-ignore-key-considered.patch seahorse-new-gnupg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse.spec ++++++ --- /var/tmp/diff_new_pack.Y6NSyu/_old 2018-01-19 11:48:49.004072882 +0100 +++ /var/tmp/diff_new_pack.Y6NSyu/_new 2018-01-19 11:48:49.004072882 +0100 @@ -1,7 +1,7 @@ # # spec file for package seahorse # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,10 @@ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.20/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM seahorse-allow-deprecated.patch [email protected] -- Allow the usage of deprecated GTK+ symbols -Patch0: seahorse-allow-deprecated.patch +# PATCH-FIX-UPSTREAM seahorse-gpg-ignore-key-considered.patch bgo#778607 [email protected] -- ignore key_considered line introduced in gpg 2.1.13. +Patch0: seahorse-gpg-ignore-key-considered.patch +# PATCH-FIX-UPSTREAM seahorse-new-gnupg.patch bsc#1075928 [email protected] -- mark gnupg 2.2.x as supported. +Patch1: seahorse-new-gnupg.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel @@ -44,6 +46,9 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsecret-unstable) >= 0.16 BuildRequires: pkgconfig(libsoup-2.4) >= 2.33.92 +# needed for patch1/patch2 +BuildRequires: autoconf +BuildRequires: automake Recommends: %{name}-lang Obsoletes: %{name}-devel < %{version} # We dropped seahorse-plugins in 12.1 @@ -69,6 +74,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build ++++++ seahorse-gpg-ignore-key-considered.patch ++++++ >From cdfc5b297d7420e47b9c973e8b8cb1b0fb576421 Mon Sep 17 00:00:00 2001 From: Tobias Mueller <[email protected]> Date: Tue, 14 Feb 2017 22:05:19 +0100 Subject: [PATCH] gpg: Ignore KEY_CONSIDERED line introduced in gpg 2.1.13 gpg 2.1.13 introduced a new status line, KEY_CONSIDERED: https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html gpgme 1.7.0 supported it: https://lists.gnupg.org/pipermail/gnupg-commits/2016-May/012130.html The line seems innocent in the sense that it tells you what keys GnuPG looked at without doing anything. We can probably safely ignore that line, as we ignore many other lines already. https://bugzilla.gnome.org/show_bug.cgi?id=778607 Signed-off-by: Stef Walter <[email protected]> * Fixed this so it compiles --- configure.ac | 2 +- pgp/seahorse-gpgme-key-op.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0f748e3d..fc4493c0 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ GTK_REQ=3.4.0 GTK_MAX=GTK_VERSION_3_4 GNUPG_ACCEPTED="2.0.12 2.1.4" -GPGME_REQUIRED=1.0.0 +GPGME_REQUIRED=1.7.0 LIBSECRET_REQUIRED=0.16 AVAHI_GLIB_REQUIRED=0.6 diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c index a765033b..3f81850d 100644 --- a/pgp/seahorse-gpgme-key-op.c +++ b/pgp/seahorse-gpgme-key-op.c @@ -330,7 +330,8 @@ seahorse_gpgme_key_op_edit (gpointer data, gpgme_status_code_t status, status == GPGME_STATUS_BAD_PASSPHRASE || status == GPGME_STATUS_USERID_HINT || status == GPGME_STATUS_SIGEXPIRED || status == GPGME_STATUS_KEYEXPIRED || status == GPGME_STATUS_PROGRESS || status == GPGME_STATUS_KEY_CREATED || - status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE) + status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE || + status == GPGME_STATUS_KEY_CONSIDERED) return parms->err; g_debug ("[edit key] state: %d / status: %d / args: %s", diff -urp seahorse-3.20.0.orig/configure seahorse-3.20.0/configure --- seahorse-3.20.0.orig/configure 2016-03-25 03:11:12.000000000 -0500 +++ seahorse-3.20.0/configure 2018-01-15 14:54:04.920812407 -0600 @@ -2533,7 +2533,7 @@ GTK_REQ=3.4.0 GTK_MAX=GTK_VERSION_3_4 GNUPG_ACCEPTED="2.0.12 2.1.4" -GPGME_REQUIRED=1.0.0 +GPGME_REQUIRED=1.7.0 LIBSECRET_REQUIRED=0.16 AVAHI_GLIB_REQUIRED=0.6 ++++++ seahorse-new-gnupg.patch ++++++ diff -urp seahorse-3.20.0.orig/configure seahorse-3.20.0/configure --- seahorse-3.20.0.orig/configure 2018-01-15 14:54:04.920812407 -0600 +++ seahorse-3.20.0/configure 2018-01-15 14:54:49.000968502 -0600 @@ -2532,7 +2532,7 @@ GCR_REQUIRED=3.11.91 GTK_REQ=3.4.0 GTK_MAX=GTK_VERSION_3_4 -GNUPG_ACCEPTED="2.0.12 2.1.4" +GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0" GPGME_REQUIRED=1.7.0 LIBSECRET_REQUIRED=0.16 AVAHI_GLIB_REQUIRED=0.6 diff -urp seahorse-3.20.0.orig/configure.ac seahorse-3.20.0/configure.ac --- seahorse-3.20.0.orig/configure.ac 2018-01-15 14:53:40.608726375 -0600 +++ seahorse-3.20.0/configure.ac 2018-01-15 14:54:44.244951654 -0600 @@ -9,7 +9,7 @@ GCR_REQUIRED=3.11.91 GTK_REQ=3.4.0 GTK_MAX=GTK_VERSION_3_4 -GNUPG_ACCEPTED="2.0.12 2.1.4" +GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0" GPGME_REQUIRED=1.7.0 LIBSECRET_REQUIRED=0.16 AVAHI_GLIB_REQUIRED=0.6
