Attachment 316982 Details for Bug 452156 – run run ck-xinit-session for all sessions where the xdg cookie isn't already set, minor fixes

[patch] run run ck-xinit-session for all sessions where the xdg cookie isn't already set, minor fixes

xorg-x11-xinit-ck-init-session3.diff (text/plain), 6.87 KB, created by Patrice Dumas on 2008-09-17 15:45:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-09-17 15:45:27 UTC

Size: 6.87 KB

patch

obsolete

>? .build--.log
>? .build-1.0.7-8.fc10.log
>? .build-1.0.9-2.fc10.log
>? .build-1.0.9-5.fc10.log
>? i386
>? xinit-1.0.7
>? xinit-1.0.7.tar.bz2
>? xinit-1.0.9
>? xorg-x11-xinit-1.0.7-8.fc10.src.rpm
>? xorg-x11-xinit-1.0.9-2.fc10.src.rpm
>? xorg-x11-xinit-1.0.9-5.fc10.src.rpm
>Index: .cvsignore
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/.cvsignore,v
>retrieving revision 1.11
>diff -u -3 -p -r1.11 .cvsignore
>--- .cvsignore	24 Sep 2007 18:10:45 -0000	1.11
>+++ .cvsignore	17 Sep 2008 15:43:25 -0000
>@@ -1 +1 @@
>-xinit-1.0.7.tar.bz2
>+xinit-1.0.9.tar.bz2
>Index: Xsession
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
>retrieving revision 1.11
>diff -u -3 -p -r1.11 Xsession
>--- Xsession	25 Aug 2008 13:49:15 -0000	1.11
>+++ Xsession	17 Sep 2008 15:43:25 -0000
>@@ -40,7 +40,7 @@ SWITCHDESKPATH=/usr/share/switchdesk
> # 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 @@ case $# in
> 	    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 @@ fi
> 
> # 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
>diff -u -3 -p -r1.4 xinitrc-common
>--- xinitrc-common	4 Feb 2008 18:49:27 -0000	1.4
>+++ xinitrc-common	17 Sep 2008 15:43:25 -0000
>@@ -65,4 +65,6 @@ if [ -x /usr/bin/ssh-agent -a -z "$SSH_A
> 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
>diff -u -3 -p -r1.62 xorg-x11-xinit.spec
>--- xorg-x11-xinit.spec	28 Aug 2008 18:38:00 -0000	1.62
>+++ xorg-x11-xinit.spec	17 Sep 2008 15:43:25 -0000
>@@ -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
>@@ -28,23 +28,23 @@ Patch2: xinit-1.0.7-poke-ck.patch
> BuildRequires: pkgconfig
> BuildRequires: libX11-devel
> BuildRequires: ConsoleKit-devel
>-BuildRequires: autoconf
>-BuildRequires: automake
>-BuildRequires: libtool
>-BuildRequires: xorg-x11-util-macros
>+#BuildRequires: autoconf
>+#BuildRequires: automake
>+#BuildRequires: libtool
>+#BuildRequires: xorg-x11-util-macros
> # NOTE: startx needs xauth in order to run, but that is not picked up
> #       automatically by rpm.  (Bug #173684)
> Requires: xauth
> # next two are for localuser.sh
> Requires: coreutils
> Requires: xorg-x11-server-utils
>+Requires: which
> Requires: ConsoleKit-x11
>-Requires: ConsoleKit-libs
> 
> # 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
> # to the xdm package.
>-Obsoletes: xinitrc
>+Obsoletes: xinitrc < 4.0.14.3-4
> 
> # We don't explicitly run dbus-launch anymore.  We depend on a dbus new enough
> # that it installs its own .sh file in xinitrc.d to launch itself at session
>@@ -56,10 +56,11 @@ Summary: Display manager support for ~/.
> Group: User Interface/X
> 
> %description
>-X.Org X11 X Window System xinit startup scripts
>+X.Org X11 X Window System xinit startup scripts.
> 
> %description session
>-Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
>+Allows legacy ~/.xsession and ~/.Xclients files to be used from display 
>+managers.
> 
> %prep
> %setup -q -n %{pkgname}-%{version}
>@@ -67,7 +68,7 @@ Allows legacy ~/.xsession and ~/.Xclient
> #%patch2 -p1 -b .poke-ck
> 
> %build
>-autoreconf
>+#autoreconf
> %configure
> # FIXME: Upstream should default to XINITDIR being this.  Make a patch to
> # Makefile.am and submit it in a bug report or check into CVS.
>@@ -81,7 +82,8 @@ make XINITDIR=/etc/X11/xinit
> rm -rf $RPM_BUILD_ROOT
> # FIXME: Upstream should default to XINITDIR being this.  Make a patch to
> # Makefile.am and submit it in a bug report or check into CVS.
>-%makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit
>+#%%makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit
>+make install DESTDIR=$RPM_BUILD_ROOT XINITDIR=/etc/X11/xinit
> install -m755 ck-xinit-session $RPM_BUILD_ROOT/%{_bindir}
> install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
> 
>@@ -109,7 +111,8 @@ rm -rf $RPM_BUILD_ROOT
> %{_bindir}/startx
> %{_bindir}/xinit
> %{_bindir}/ck-xinit-session
>-%dir %{_sysconfdir}/X11
>+#already owned by filesystem
>+#%dir %{_sysconfdir}/X11
> %dir %{_sysconfdir}/X11/xinit
> %{_sysconfdir}/X11/xinit/xinitrc
> %{_sysconfdir}/X11/xinit/xinitrc-common
>@@ -129,6 +132,11 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/xsessions/xinit-compat.desktop
> 
> %changelog
>+* Wed Sep 17 2008 Patrice Dumas <pertusus@free.fr> 1.0.9-5
>+- run ck-xinit-session for all sessions where the xdg cookie isn't already
>+  set (#452156)
>+- add which Requires (#413041)
>+
> * Mon Aug 25 2008 Matthias Clasen <mclasen@redhat.com> 1.0.9-4
> - Make the gnome session actually take the gnome case in the switch (#458694)
> - Update patches

Actions: View | Diff

Attachments on bug 452156: 309866 | 311066 | 311422 | 316982