rpms/xorg-x11-xinit/devel Xsession, 1.11, 1.12 xinitrc-common, 1.4, 1.5 xorg-x11-xinit.spec, 1.62, 1.63

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17621

Modified Files:
	Xsession xinitrc-common xorg-x11-xinit.spec 
Log Message:
- run ck-xinit-session for all sessions where the xdg cookie isn't already
  set (#452156, patch from Patrice Dumas)
- add which Requires (#413041, patch from Patrice Dumas)



Index: Xsession
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Xsession	25 Aug 2008 13:49:15 -0000	1.11
+++ Xsession	25 Feb 2009 09:57:22 -0000	1.12
@@ -40,7 +40,7 @@
 # this script. 
 XCLIENTS_D=/etc/X11/xinit/Xclients.d
 if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
-    exec -l $SHELL -c "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
 else
 # now, we see if xdm/gdm/kdm has asked for a specific environment
 case $# in
@@ -60,18 +60,18 @@
 	    exec /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" 
 	    ;;
 	kde|kde1|kde2)
-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
+	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
 	    ;;
 	twm)
         # fall back to twm
-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"twm\""
+	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"twm\""
 	    ;;
 	*)
        # GDM provies either a command line as the first argument or
        # provides 'failsafe', 'default' or 'custom'.  KDM will do the
        # same at some point
 	    if [ "$1" != "default" -a "$1" != "custom" ]; then
-		exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
+		exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
 	    fi
 	    ;;
     esac
@@ -80,11 +80,11 @@
 
 # otherwise, take default action
 if [ -x "$HOME/.xsession" ]; then
-    exec -l $SHELL -c "$SSH_AGENT $HOME/.xsession"
+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $HOME/.xsession"
 elif [ -x "$HOME/.Xclients" ]; then
-    exec -l $SHELL -c "$SSH_AGENT $HOME/.Xclients"
+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients"
 elif [ -x /etc/X11/xinit/Xclients ]; then
-    exec -l $SHELL -c "$SSH_AGENT /etc/X11/xinit/Xclients"
+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients"
 else
     # should never get here; failsafe fallback
     exec -l $SHELL -c "xsm"


Index: xinitrc-common
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinitrc-common	4 Feb 2008 18:49:27 -0000	1.4
+++ xinitrc-common	25 Feb 2009 09:57:22 -0000	1.5
@@ -65,4 +65,6 @@
 fi
 
 CK_XINIT_SESSION=
-[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
+if [ -x /usr/bin/ck-xinit-session -a -z "$XDG_SESSION_COOKIE" ]; then
+    CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
+fi


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-xinit.spec	28 Aug 2008 18:38:00 -0000	1.62
+++ xorg-x11-xinit.spec	25 Feb 2009 09:57:22 -0000	1.63
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -39,7 +39,7 @@
 Requires: coreutils
 Requires: xorg-x11-server-utils
 Requires: ConsoleKit-x11
-Requires: ConsoleKit-libs
+Requires: which
 
 # NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
 # so the xinitrc package became unnecessary.  The xdm configs/scripts move
@@ -129,6 +129,11 @@
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Wed Feb 25 2009 Adam Tkac <atkac redhat com> 1.0.9-5
+- run ck-xinit-session for all sessions where the xdg cookie isn't already
+  set (#452156, patch from Patrice Dumas)
+- add which Requires (#413041, patch from Patrice Dumas)
+
 * Mon Aug 25 2008 Matthias Clasen <mclasen at redhat.com> 1.0.9-4
 - Make the gnome session actually take the gnome case in the switch (#458694)
 - Update patches