From 811f618e0feac108b231f69fd3a75f191dd0d7f4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 09 2009 03:28:43 +0000
Subject: fix service activation


---

diff --git a/gnome-keyring-autostart.patch b/gnome-keyring-autostart.patch
new file mode 100644
index 0000000..89f7d41
--- /dev/null
+++ b/gnome-keyring-autostart.patch
@@ -0,0 +1,8 @@
+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 2751580..082d8a8 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -8,13 +8,16 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.0
-Release: 3%{?dist}
+Release: 4%{?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
@@ -65,6 +68,7 @@ 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
@@ -141,6 +145,9 @@ fi
 
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-4
+- Fix service activation
+
 * Tue Apr  7 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-3
 - Revert the previous patch since it causes crashes