From ac109610ec8ea086b7766c557538dd378021791c Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 3 Jan 2011 12:17:13 +0100
Subject: [PATCH] - Update to 2.91.4

---
 .gitignore         |  1 +
 gnome-keyring.spec | 14 ++++++++------
 sources            |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29a975d..46354f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnome-keyring-2.31.4.tar.bz2
 /gnome-keyring-2.91.1.tar.bz2
 /gnome-keyring-2.91.2.tar.bz2
 /gnome-keyring-2.91.3.tar.bz2
+/gnome-keyring-2.91.4.tar.bz2
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 895b88e..48388d3 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -6,8 +6,8 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.91.3
-Release: 2%{?dist}
+Version: 2.91.4
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/gnome-keyring
@@ -94,9 +94,8 @@ make install 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
+rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
 
 %find_lang gnome-keyring
 
@@ -119,9 +118,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 # LGPL
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/gnome-keyring
-%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
+%{_libdir}/pkcs11/*.so
 %{_libdir}/gnome-keyring/devel/*.so
-%{_libdir}/gnome-keyring/standalone/*.so
 # GPL
 %{_bindir}/*
 %{_libexecdir}/*
@@ -130,6 +128,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_datadir}/gnome-keyring
 %{_datadir}/gnome-keyring-3
 %{_sysconfdir}/xdg/autostart/*
+%{_sysconfdir}/xdg/pkcs11.conf.defaults
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 
@@ -146,6 +145,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Mon Jan  3 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.4-1
+- Update to 2.91.4
+
 * Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.3-2
 - Rebuild against new gtk
 
diff --git a/sources b/sources
index 9d459a5..733e839 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6a2ce48d5b520467b7ffae00ec29f16  gnome-keyring-2.91.3.tar.bz2
+76b4f017dafb15f97f90088145d52723  gnome-keyring-2.91.4.tar.bz2