From b2c2287aef783bb1af3b6ade52b2e6361e063441 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Oct 23 2015 09:39:31 +0000
Subject: Update to 3.18.2


---

diff --git a/.gitignore b/.gitignore
index 2a78d19..a7ae490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ gnome-keyring-2.31.4.tar.bz2
 /gnome-keyring-3.17.91.tar.xz
 /gnome-keyring-3.18.0.tar.xz
 /gnome-keyring-3.18.1.tar.xz
+/gnome-keyring-3.18.2.tar.xz
diff --git a/0001-dbus-Fix-object-path-regression-from-GDBus-port.patch b/0001-dbus-Fix-object-path-regression-from-GDBus-port.patch
deleted file mode 100644
index 17135bb..0000000
--- a/0001-dbus-Fix-object-path-regression-from-GDBus-port.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 7840cb97902c952c34831cc63dcba00ececabd0c Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Fri, 16 Oct 2015 22:46:07 +0200
-Subject: [PATCH] dbus: Fix object path regression from GDBus port
-
-Previously objects were only explicitly exported on the bus when
-they were ready. However now due to GDBus handler connections
-they are exported earlier.
-
-Make sure to export a prompt object before something is exported
-at the same object path to take its place.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756032
----
- daemon/dbus/gkd-secret-create.c |  1 +
- daemon/dbus/gkd-secret-prompt.c | 10 ++++++++++
- daemon/dbus/gkd-secret-prompt.h |  3 +++
- 3 files changed, 14 insertions(+)
-
-diff --git a/daemon/dbus/gkd-secret-create.c b/daemon/dbus/gkd-secret-create.c
-index 0f2b573..cd5587b 100644
---- a/daemon/dbus/gkd-secret-create.c
-+++ b/daemon/dbus/gkd-secret-create.c
-@@ -176,6 +176,7 @@ unlock_or_complete_this_prompt (GkdSecretCreate *self)
- 
- 	g_object_ref (self);
- 	prompt = GKD_SECRET_PROMPT (self);
-+	gkd_secret_prompt_unexport (prompt);
- 
- 	unlock = gkd_secret_unlock_new (gkd_secret_prompt_get_service (prompt),
- 					gkd_secret_prompt_get_caller (prompt),
-diff --git a/daemon/dbus/gkd-secret-prompt.c b/daemon/dbus/gkd-secret-prompt.c
-index 207cc8a..f0a6d63 100644
---- a/daemon/dbus/gkd-secret-prompt.c
-+++ b/daemon/dbus/gkd-secret-prompt.c
-@@ -202,6 +202,16 @@ gkd_secret_prompt_constructed (GObject *obj)
- 			  G_CALLBACK (prompt_method_prompt), self);
- }
- 
-+void
-+gkd_secret_prompt_unexport (GkdSecretPrompt *self)
-+{
-+	g_return_if_fail (self->pv->skeleton != NULL);
-+	g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (self->pv->skeleton));
-+	g_signal_handlers_disconnect_by_func (self->pv->skeleton, prompt_method_dismiss, self);
-+	g_signal_handlers_disconnect_by_func (self->pv->skeleton, prompt_method_prompt, self);
-+	g_clear_object (&self->pv->skeleton);
-+}
-+
- static void
- gkd_secret_prompt_init (GkdSecretPrompt *self)
- {
-diff --git a/daemon/dbus/gkd-secret-prompt.h b/daemon/dbus/gkd-secret-prompt.h
-index 0b52ea0..a133f25 100644
---- a/daemon/dbus/gkd-secret-prompt.h
-+++ b/daemon/dbus/gkd-secret-prompt.h
-@@ -77,4 +77,7 @@ void                gkd_secret_prompt_dismiss                 (GkdSecretPrompt *
- void                gkd_secret_prompt_dismiss_with_error      (GkdSecretPrompt *self,
-                                                                GError *error);
- 
-+/* Used by derived classes */
-+void                gkd_secret_prompt_unexport                (GkdSecretPrompt *self);
-+
- #endif /* __GKD_SECRET_PROMPT_H__ */
--- 
-2.5.0
-
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index dd20c0a..fbf3055 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -4,17 +4,14 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 3.18.1
-Release: 2%{?dist}
+Version: 3.18.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/gnome-keyring
 Source:  https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
 URL:     https://wiki.gnome.org/Projects/GnomeKeyring
 
-# Backported from upstream
-Patch0:  0001-dbus-Fix-object-path-regression-from-GDBus-port.patch
-
 BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(p11-kit-1)
@@ -52,7 +49,7 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1
+
 
 %build
 %configure \
@@ -109,6 +106,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 
 %changelog
+* Fri Oct 23 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
+- Update to 3.18.2
+
 * Sat Oct 17 2015 Kalev Lember <klember@redhat.com> - 3.18.1-2
 - dbus: Fix object path regression from GDBus port
 
diff --git a/sources b/sources
index ebc6df1..fc43d11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-329c75f452028e7dc20b3542ffcb9714  gnome-keyring-3.18.1.tar.xz
+672eba19f4504351f2b82890682f2872  gnome-keyring-3.18.2.tar.xz