From 2d3a71273fdbc6ee3a690eff2fff7cbf9b7f0dbe Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Apr 2009 03:20:53 +0000 Subject: [PATCH] 2.26.1 --- .cvsignore | 2 +- gnome-keyring-2.26.0-egg-endless-loop.patch | 13 ------------- gnome-keyring-autostart.patch | 8 -------- gnome-keyring.spec | 12 ++++++------ sources | 2 +- 5 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 gnome-keyring-2.26.0-egg-endless-loop.patch delete mode 100644 gnome-keyring-autostart.patch diff --git a/.cvsignore b/.cvsignore index 9d378c8..6573a90 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-keyring-2.26.0.tar.bz2 +gnome-keyring-2.26.1.tar.bz2 diff --git a/gnome-keyring-2.26.0-egg-endless-loop.patch b/gnome-keyring-2.26.0-egg-endless-loop.patch deleted file mode 100644 index c5bebad..0000000 --- a/gnome-keyring-2.26.0-egg-endless-loop.patch +++ /dev/null @@ -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 { diff --git a/gnome-keyring-autostart.patch b/gnome-keyring-autostart.patch deleted file mode 100644 index 89f7d41..0000000 --- a/gnome-keyring-autostart.patch +++ /dev/null @@ -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 diff --git a/gnome-keyring.spec b/gnome-keyring.spec index 082d8a8..19c4607 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -7,17 +7,14 @@ Summary: Framework for managing passwords and other secrets Name: gnome-keyring -Version: 2.26.0 -Release: 4%{?dist} +Version: 2.26.1 +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 - 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 - 2.26.0-4 - Fix service activation diff --git a/sources b/sources index 82d842c..8108761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0395fcf79b990465030a2795dcddacb9 gnome-keyring-2.26.0.tar.bz2 +060b349a0aae130fdd3cd0a9827258c6 gnome-keyring-2.26.1.tar.bz2