From cde9605c057455d0e2a74aaa45c595e043d3d119 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 30 Mar 2010 21:26:38 +0000
Subject: [PATCH] 2.30.0

---
 gnome-keyring.spec | 23 +++++++----------------
 sources            |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 16bc7e5..fbdbe22 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -7,24 +7,17 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.29.92
-Release: 2%{?dist}
+Version: 2.30.0
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.29/gnome-keyring-%{version}.tar.bz2
+#VCS: git:git://git.gnome.org/gnome-keyring
+Source: http://download.gnome.org/sources/gnome-keyring/2.30/gnome-keyring-%{version}.tar.bz2
 
 # http://bugzilla.redhat.com/529709
 # http://bugs.gnome.org/598494
 Patch3: gnome-keyring-2.28.1-nopass.patch
 
-# from master
-Patch4: gnome-keyring-2.30.0-better-error-handling.patch
-Patch5: gnome-keyring-2.30.0-dont-save-session-keyring-to-disk.patch
-Patch6: gnome-keyring-2.30.0-unlocking-when-unavailable.patch
-Patch7: gnome-keyring-2.30.0-hide-automaticall-unlock.patch
-Patch8: gnome-keyring-2.30.0-fix-storing-autounlock.patch
-
-
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,11 +76,6 @@ automatically unlock the "login" keyring when the user logs in.
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch3 -p1 -b .no-pass
-%patch4 -p1 -b .better-error-handling
-%patch5 -p1 -b .dont-save-session-keyring-to-disk
-%patch6 -p1 -b .unlocking-when-unavailable
-%patch7 -p1 -b .hide-automaticall-unlock
-%patch8 -p1 -b .fix-storing-autounlock
 
 
 %build
@@ -166,6 +154,9 @@ fi
 
 
 %changelog
+* Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Mon Mar 22 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.92-2
 - More robust error display and handling
 - [secret-store] Don't save session keyring to disk
diff --git a/sources b/sources
index d07ce87..b61cb2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6990822957b88af293751c81a25b46d5  gnome-keyring-2.29.92.tar.bz2
+293f3dfed78b5c3d34d72d1561f5aa32  gnome-keyring-2.30.0.tar.bz2