rpms/xorg-x11-xinit/devel Xsession, 1.9, 1.10 xorg-x11-xinit.spec, 1.56, 1.57

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4388

Modified Files:
	Xsession xorg-x11-xinit.spec 
Log Message:
* Tue Apr 08 2008 Adam Jackson <ajax at redhat.com> 1.0.7-7
- Xsession: Don't start ssh-agent for gnome sessions anymore, gnome-keyring
  acts as an agent now. (#441123)



Index: Xsession
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Xsession	4 Feb 2008 18:49:27 -0000	1.9
+++ Xsession	8 Apr 2008 21:20:03 -0000	1.10
@@ -54,8 +54,10 @@
 	    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\""


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xorg-x11-xinit.spec	12 Mar 2008 16:44:39 -0000	1.56
+++ xorg-x11-xinit.spec	8 Apr 2008 21:20:03 -0000	1.57
@@ -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 @@
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Tue Apr 08 2008 Adam Jackson <ajax at 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 at redhat.com> 1.0.7-6
 - Add a new subpackage to add ~/.xsessions and ~/.Xclients
   to session list