From 6f9fbe04759e1f243bc0473b894907a3d405760d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Tue, 8 Apr 2008 21:20:03 +0000
Subject: [PATCH] - Xsession: Don't start ssh-agent for gnome sessions anymore,
 gnome-keyring     acts as an agent now. (#441123)

---
 Xsession            | 6 ++++--
 xorg-x11-xinit.spec | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Xsession b/Xsession
index 0a4f4bf..3612890 100644
--- a/Xsession
+++ b/Xsession
@@ -54,8 +54,10 @@ case $# in
 	    exec -l $SHELL -c "xterm -geometry 80x24-0-0"
 	    ;;
 	gnome)
-	    exec -l $SHELL -c "$SSH_AGENT gnome-session"
-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" 
+	    # lack of SSH_AGENT is intentional, see #441123.  though
+	    # the whole thing should really happen in xinitrc.d anyway.
+	    exec -l $SHELL -c gnome-session
+	    exec /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" 
 	    ;;
 	kde|kde1|kde2)
 	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index 9871ae8..2492c23 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.7
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -131,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Tue Apr 08 2008 Adam Jackson <ajax@redhat.com> 1.0.7-7
+- Xsession: Don't start ssh-agent for gnome sessions anymore, gnome-keyring
+  acts as an agent now. (#441123)
+
 * Wed Mar 12 2008 Ray Strode <rstrode@redhat.com> 1.0.7-6
 - Add a new subpackage to add ~/.xsessions and ~/.Xclients
   to session list