From 9b1e6428350c53dcc60700a7d63ba010f530dd0dda38102e6693693c02555c4e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 22 Apr 2021 07:42:41 +0000
Subject: [PATCH] Accepting request 884844 from GNOME:Next

Update to 40.0

OBS-URL: https://build.opensuse.org/request/show/884844
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=213
---
 153.patch                | 32 --------------------------------
 seahorse-40.0.tar.xz     |  3 +++
 seahorse-40.alpha.tar.xz |  3 ---
 seahorse.changes         | 15 +++++++++++++++
 seahorse.spec            |  6 ++----
 5 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100644 153.patch
 create mode 100644 seahorse-40.0.tar.xz
 delete mode 100644 seahorse-40.alpha.tar.xz

diff --git a/153.patch b/153.patch
deleted file mode 100644
index c24b2a4..0000000
--- a/153.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a635e5df77ced15dbc7ac3b7b461108133cdb4d7 Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Sat, 20 Feb 2021 09:06:44 +0100
-Subject: [PATCH] key-manager: Make sure to update after unlocking
-
-When we unlock a keyring, the main list view gets updated due to a
-signal that gets triggered when the number of elements in a collection
-changes. In the case of an empty keying however, we won't get this
-signal as the number of elements will remain zero. We can fix this by
-explicitly triggering an update.
-
-Fixes https://gitlab.gnome.org/GNOME/seahorse/-/issues/315
----
- src/key-manager.vala | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/key-manager.vala b/src/key-manager.vala
-index ed5e4ca0..559188f1 100644
---- a/src/key-manager.vala
-+++ b/src/key-manager.vala
-@@ -492,6 +492,8 @@ public class Seahorse.KeyManager : Catalog {
-             try {
-                 unlock_button.sensitive = true;
-                 place.unlock.end(res);
-+                // Explicitly trigger an update of the main view
-+                check_empty_state();
-             } catch (GLib.Error e) {
-                 unlock_button.sensitive = true;
-                 Util.show_error(this, _("Couldn’t unlock keyring"), e.message);
--- 
-GitLab
-
diff --git a/seahorse-40.0.tar.xz b/seahorse-40.0.tar.xz
new file mode 100644
index 0000000..1c4b773
--- /dev/null
+++ b/seahorse-40.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ec7057b3868bac6ea041fda82140a39f5ec9e5b188b450914d453bc2d55d02c
+size 1309064
diff --git a/seahorse-40.alpha.tar.xz b/seahorse-40.alpha.tar.xz
deleted file mode 100644
index 1d971dc..0000000
--- a/seahorse-40.alpha.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04c229e6ad4f1dbf1332d5ac47af0a5ff7a3cd969b03dea1e91204f5fa06d3c5
-size 1324836
diff --git a/seahorse.changes b/seahorse.changes
index 6ce5b74..0fb7fc4 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Apr 13 06:39:03 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 40.0:
+  + Fix paint issue when unlocking empty login keyring
+    (boo#1179003).
+  + pgp:
+    - Properly fix keyserver registration.
+    - Add unit tests for PGP keyserver code.
+  * build: Unbreak build using vala 0.48.x.
+  * ci: Add minimal style checks to the CI.
+  * Several code cleanups.
+  * Updated translations.
+- Drop 153.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Feb 23 09:29:37 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/seahorse.spec b/seahorse.spec
index 9c9ad31..6ac2de4 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -17,15 +17,13 @@
 
 
 Name:           seahorse
-Version:        40.alpha
+Version:        40.0
 Release:        0
 Summary:        GNOME interface for gnupg
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.1-only
+License:        GFDL-1.1-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Security
 URL:            https://wiki.gnome.org/Apps/Seahorse
 Source0:        https://download.gnome.org/sources/seahorse/40/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 153.patch boo#1179003 dimstar@opensuse.org -- key-manager: Make sure to update after unlocking
-Patch0:         https://gitlab.gnome.org/GNOME/seahorse/-/merge_requests/153.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gpg2 >= 2.2.0