[gnome-keyring/f14/master] - Update to 2.31.92

[Tomas Bzatek]

commit 5a880a0a73883b3acf7097302d47da8cfe98f871
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Mon Sep 13 14:32:26 2010 +0200

    - Update to 2.31.92

 .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                                 |   41 +-
 pam-headers.patch                                  |   12 -
 sources                                            |    2 +-
 10 files changed, 19 insertions(+), 2137 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9d4ac4..247fb34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gnome-keyring-2.31.4.tar.bz2
 /gnome-keyring-2.31.91.tar.bz2
+/gnome-keyring-2.31.92.tar.bz2
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index dfba9d0..9fdaf91 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,4 +1,4 @@
-%define glib2_version 2.16.0
+%define glib2_version 2.25.0
 %define gtk2_version 2.20.0
 %define dbus_version 1.0
 %define hal_version 0.5.7
@@ -7,7 +7,7 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.31.91
+Version: 2.31.92
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -15,22 +15,13 @@ Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.31/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
 
 
-# Bug 611642  - gnome-keyring isn't staying unlocked
-# https://bugzilla.redhat.com/show_bug.cgi?id=611642
-Patch4: gnome-keyring-2.31.5-ssh-agent-unlock.patch
-
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: libgcrypt-devel >= %{gcrypt_version}
 BuildRequires: libtasn1-devel >= %{libtasn1_version}
@@ -40,9 +31,6 @@ BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libtasn1-tools
 BuildRequires: libgnome-keyring-devel
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
 # for smooth transition since the core was split
 Requires: libgnome-keyring
 
@@ -79,8 +67,7 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .pam-headers
-
+%patch3 -p1 -b .no-pass
 
 # Enable daemon autostart in XFCE
 for i in daemon/*.desktop.in.in; do
@@ -94,7 +81,8 @@ autoreconf -i -f
 %configure --disable-gtk-doc \
            --with-pam-dir=/%{_lib}/security \
            --disable-acl-prompts \
-           --enable-pam
+           --enable-pam \
+           --with-gtk=2.0
 
 # avoid unneeded direct dependencies
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
@@ -102,9 +90,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 rm $RPM_BUILD_ROOT/%{_lib}/security/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -117,13 +103,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
 %post
 /sbin/ldconfig
 
-%pre
-%gconf_schema_obsolete gnome-keyring
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
+fi
 
-%preun
-%gconf_schema_remove gnome-keyring
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
-%postun -p /sbin/ldconfig
 
 %files -f gnome-keyring.lang
 %defattr(-, root, root)
@@ -141,6 +129,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
 %{_datadir}/gcr
 %{_datadir}/gnome-keyring
 %{_sysconfdir}/xdg/autostart/*
+%{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
 
 %files devel
 %defattr(-, root, root)
@@ -155,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 28d32b0..ea78f64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8abae3120341351a66e0ccd9cacf5218  gnome-keyring-2.31.91.tar.bz2
+666ce443754505ccae6d047348c8d1ea  gnome-keyring-2.31.92.tar.bz2