Revert crashy patch

This commit is contained in:
Matthias Clasen 2009-04-07 17:23:57 +00:00
parent 9662952340
commit 3b11c0ed6e
1 changed files with 7 additions and 9 deletions

View File

@ -8,15 +8,12 @@
Summary: Framework for managing passwords and other secrets
Name: gnome-keyring
Version: 2.26.0
Release: 2%{?dist}
Release: 3%{?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)
# already in gnome svn, fixes a nasty bug described in http://bugzilla.gnome.org/show_bug.cgi?id=575247
Patch0: gnome-keyring-2.26.0-egg-endless-loop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@ -29,15 +26,14 @@ BuildRequires: pam-devel
BuildRequires: autoconf, automake, libtool
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: perl(XML::Parser)
BuildRequires: libtasn1-tools
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): GConf2
%description
The gnome-keyring session daemon manages passwords and other types of
secrets for the user, storing them encrypted with a main password.
The gnome-keyring session daemon manages passwords and other types of
secrets for the user, storing them encrypted with a main password.
Applications can use the gnome-keyring library to integrate with the keyring.
%package devel
@ -69,7 +65,6 @@ automatically unlock the "login" keyring when the user logs in.
%prep
%setup -q -n gnome-keyring-%{version}
%patch0 -p1 -b .nasty-endless-loop
%build
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@ -146,6 +141,9 @@ fi
%changelog
* Tue Apr 7 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-3
- Revert the previous patch since it causes crashes
* Thu Apr 02 2009 Richard Hughes <rhughes@redhat.com> - 2.26.0-2
- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
would hang when re-allocating from a pool of secure memory.