From f70ca3bee5da916f1502e11022740f9c2f4564c25d560cac6d937a999c4a3c89 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 14 Jan 2014 07:39:25 +0000
Subject: [PATCH] Accepting request 213228 from GNOME:Next

- Update to version 3.10.2:
  + Fix pgp/ssh key export (bgo#707014).
  + Fix SSH key generation (bgo#715051).
  + Update homepage URL.
  + Build fixes (bgo#712538).
  + Updated translations.
- Drop seahorse-ssh-keypair.patch: fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/213228
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=159
---
 seahorse-3.10.1.tar.xz     |  3 ---
 seahorse-3.10.2.tar.xz     |  3 +++
 seahorse-ssh-keypair.patch | 29 -----------------------------
 seahorse.changes           | 11 +++++++++++
 seahorse.spec              |  7 ++-----
 5 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 seahorse-3.10.1.tar.xz
 create mode 100644 seahorse-3.10.2.tar.xz
 delete mode 100644 seahorse-ssh-keypair.patch

diff --git a/seahorse-3.10.1.tar.xz b/seahorse-3.10.1.tar.xz
deleted file mode 100644
index b72c9b9..0000000
--- a/seahorse-3.10.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985
-size 2110272
diff --git a/seahorse-3.10.2.tar.xz b/seahorse-3.10.2.tar.xz
new file mode 100644
index 0000000..bf10047
--- /dev/null
+++ b/seahorse-3.10.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16
+size 2109592
diff --git a/seahorse-ssh-keypair.patch b/seahorse-ssh-keypair.patch
deleted file mode 100644
index 1fe55d2..0000000
--- a/seahorse-ssh-keypair.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From db804a82e7828848bcf48b1603f7bcbb0ad78a5a Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Fri, 22 Nov 2013 22:44:47 -0600
-Subject: [PATCH] Fix SSH key generation
-
-Here, i used to be a guint, but was recently changed into a gint to
-silence a compiler warning. This caused the for loop to terminate
-without ever iterating.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=715053
----
- ssh/seahorse-ssh-source.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssh/seahorse-ssh-source.c b/ssh/seahorse-ssh-source.c
-index 1f015f0..8cc233e 100644
---- a/ssh/seahorse-ssh-source.c
-+++ b/ssh/seahorse-ssh-source.c
-@@ -917,7 +917,7 @@ seahorse_ssh_source_file_for_algorithm (SeahorseSSHSource *ssrc, guint algo)
-         break;
-     }
-     
--    for (i = 0; i < ~0; i++) {
-+    for (i = 0; i < G_MAXINT; i++) {
-         t = (i == 0) ? g_strdup (pref) : g_strdup_printf ("%s.%d", pref, i);
-         filename = g_build_filename (ssrc->priv->ssh_homedir, t, NULL);
-         g_free (t);
--- 
-1.8.3.1
diff --git a/seahorse.changes b/seahorse.changes
index 27a83d6..95b4b8e 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan  8 16:50:13 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.10.2:
+  + Fix pgp/ssh key export (bgo#707014).
+  + Fix SSH key generation (bgo#715051).
+  + Update homepage URL.
+  + Build fixes (bgo#712538).
+  + Updated translations.
+- Drop seahorse-ssh-keypair.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Sat Nov 23 04:54:40 UTC 2013 - dimstar@opensuse.org
 
diff --git a/seahorse.spec b/seahorse.spec
index b71160d..1128192 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package seahorse
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
 
 
 Name:           seahorse
-Version:        3.10.1
+Version:        3.10.2
 Release:        0
 Summary:        GNOME interface for gnupg
 License:        GPL-2.0+
 Group:          Productivity/Security
 Url:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse/3.10/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM seahorse-ssh-keypair.patch bnc#851050 bgo#715053 dimstar@opensuse.org -- Fix SSH key generation
-Patch0:         seahorse-ssh-keypair.patch
 BuildRequires:  fdupes
 BuildRequires:  gpg2
 BuildRequires:  gpgme-devel
@@ -68,7 +66,6 @@ search results from documents.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build