From cc5d8a9194a3de3f54f1094efd18d0662ca7fd3e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 08 2007 03:57:31 +0000
Subject: 2.21.3.2


---

diff --git a/.cvsignore b/.cvsignore
index 9d9c55c..672ff67 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-keyring-2.20.2.tar.bz2
+gnome-keyring-2.21.3.2.tar.bz2
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index b600a8b..650af5c 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,27 +1,31 @@
-%define gtk2_version 2.3.1
+%define glib2_version 2.6.0
+%define gtk2_version 2.6.0
+%define dbus_version 1.0
+%define hal_version 0.5.7
+%define gcrypt_version 1.2.2
+%define libtasn1_version 0.3.4
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.20.2
-Release: 2%{?dist}
+Version: 2.21.3.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: dbus-devel >= 1.0
-BuildRequires: gettext
-BuildRequires: libgcrypt-devel
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: libgcrypt-devel >= %{gcrypt_version}
+BuildRequires: libtasn1-devel >= %{libtasn1_version}
 BuildRequires: pam-devel
-BuildRequires: hal-devel
 BuildRequires: autoconf, automake, libtool
+BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: perl(XML::Parser)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=484612 
-Patch0:    gnome-keyring-2.20-selinux-pam.patch
-
 %description
 gnome-keyring manages passwords and other types of secrets
 for the user, storing them encrypted with a main password.
@@ -60,8 +64,6 @@ and start the keyring daemon.
 %prep
 %setup -q -n gnome-keyring-%{version}
 
-%patch0 -p1 -b .selinux_pam
-
 %build
 aclocal
 automake
@@ -75,6 +77,7 @@ make install install-pam DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT/%{_lib}/security/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la
 
 %find_lang gnome-keyring
 
@@ -89,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README COPYING COPYING.LIB
 # LGPL
 %{_libdir}/lib*.so.*
+%dir %{_libdir}/gnome-keyring
+%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
 # GPL
 %{_bindir}/*
 %{_libexecdir}/*
@@ -106,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  7 2007 Matthias Clasen  <mclasen@redhat.com> - 2.21.3.2-1
+- Update to 2.21.3.2
+
 * Fri Nov 30 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.2-2
 - Reenable auto-unlock
 
diff --git a/sources b/sources
index c194823..97d1995 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a868f7f661a0ca8fecaf3c55931f489  gnome-keyring-2.20.2.tar.bz2
+cb88bb9c360970057204c3461eb94b98  gnome-keyring-2.21.3.2.tar.bz2