2.26.1

.cvsignore

@@ -1 +1 @@
-gnome-keyring-2.26.0.tar.bz2
+gnome-keyring-2.26.1.tar.bz2

gnome-keyring-2.26.0-egg-endless-loop.patch

@@ -1,13 +0,0 @@
-diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
-index a215364..ba0cf5c 100644
---- a/egg/egg-secure-memory.c
-+++ b/egg/egg-secure-memory.c
-@@ -341,7 +341,7 @@ sec_insert_cell_ring (Cell **ring, Cell *cell)
- 	/* Insert back into the mix of available memory */ 
- 	if (*ring) { 
- 		cell->next = (*ring)->next;
--		cell->prev = (*ring)->prev;
-+		cell->prev = *ring;
- 		cell->next->prev = cell;
- 		cell->prev->next = cell;
- 	} else {

gnome-keyring-autostart.patch

@@ -1,8 +0,0 @@
-diff -up gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in.autostart gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in
---- gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in.autostart	2009-04-08 23:23:49.792737030 -0400
-+++ gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in	2009-04-08 23:24:24.201988092 -0400
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.gnome.keyring
--Exec=@VALGRIND_RUN@ gnome-keyring-daemon --foreground --components=keyring
-+Exec=/usr/bin/gnome-keyring-daemon --foreground --components=keyring

gnome-keyring.spec

@@ -7,17 +7,14 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.26.0
+Version: 2.26.1
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=578448
-Patch0: gnome-keyring-autostart.patch
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -68,7 +65,6 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .activation
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -145,6 +141,10 @@ fi
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.news
+
 * Wed Apr  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-4
 - Fix service activation
 

sources

@@ -1 +1 @@
-0395fcf79b990465030a2795dcddacb9  gnome-keyring-2.26.0.tar.bz2
+060b349a0aae130fdd3cd0a9827258c6  gnome-keyring-2.26.1.tar.bz2