rpms/gnome-keyring/devel gnome-keyring-autostart.patch, NONE, 1.1 gnome-keyring.spec, 1.120, 1.121

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8585

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-autostart.patch 
Log Message:
fix service activation


gnome-keyring-autostart.patch:

--- NEW FILE gnome-keyring-autostart.patch ---
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


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-keyring.spec	7 Apr 2009 17:23:57 -0000	1.120
+++ gnome-keyring.spec	9 Apr 2009 03:28:43 -0000	1.121
@@ -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 @@
 
 %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 @@
 
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
+- Fix service activation
+
 * Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
 - Revert the previous patch since it causes crashes