[gnome-keyring/f14/master: 2/2] merge

[Matthias Clasen]

commit 7103ad4e6b8c6acb2464a0a84a67e4a88d872710
Merge: 7550b18 2b4fd1c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 00:05:54 2010 -0400

    merge

 .gitignore                                         |    1 +
 gnome-keyring-2.30.0-better-error-handling.patch   | 1361 --------------------
 ...-2.30.0-dont-save-session-keyring-to-disk.patch |  259 ----
 gnome-keyring-2.30.0-fix-storing-autounlock.patch  |  335 -----
 ...e-keyring-2.30.0-hide-automaticall-unlock.patch |   26 -
 ...keyring-2.30.0-unlocking-when-unavailable.patch |   52 -
 gnome-keyring-2.31.5-ssh-agent-unlock.patch        |   67 -
 gnome-keyring.spec                                 |   40 +-
 pam-headers.patch                                  |   12 -
 9 files changed, 18 insertions(+), 2135 deletions(-)
---
diff --cc .gitignore
index 01f560d,247fb34..590c295
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  gnome-keyring-2.31.4.tar.bz2
  /gnome-keyring-2.31.91.tar.bz2
 +/gnome-keyring-2.32.0.tar.bz2
+ /gnome-keyring-2.31.92.tar.bz2
diff --cc gnome-keyring.spec
index fb78923,c78c63f..b46628b
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@@ -12,12 -12,9 +12,9 @@@ Release: 1%{?dist
  License: GPLv2+ and LGPLv2+
  Group: System Environment/Libraries
  #VCS: git:git://git.gnome.org/gnome-keyring
 -Source: http://download.gnome.org/sources/gnome-keyring/2.31/gnome-keyring-%{version}.tar.bz2
 +Source: http://download.gnome.org/sources/gnome-keyring/2.32/gnome-keyring-%{version}.tar.bz2
  URL: http://www.gnome.org
  
- # https://bugzilla.gnome.org/show_bug.cgi?id=628457
- Patch0: pam-headers.patch
- 
  # http://bugzilla.redhat.com/529709
  # http://bugs.gnome.org/598494
  Patch3: gnome-keyring-2.28.1-nopass.patch
@@@ -155,9 -146,9 +146,12 @@@ glib-compile-schemas %{_datadir}/glib-2
  
  
  %changelog
 +* Tue Sep 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
 +- Update to 2.32.0
 +
+ * Mon Sep 13 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.92-1
+ - Update to 2.31.92
+ 
  * Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.91-1
  - Update to 2.31.91