rpms/xorg-x11-xinit/devel Xsession, 1.8, 1.9 xinitrc, 1.4, 1.5 xinitrc-common, 1.3, 1.4 xorg-x11-xinit.spec, 1.52, 1.53
Ray Strode (rstrode)
fedora-extras-commits at redhat.com
Mon Feb 4 18:50:20 UTC 2008
Author: rstrode
Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19644
Modified Files:
Xsession xinitrc xinitrc-common xorg-x11-xinit.spec
Log Message:
- don't special case dbus-launch. dbus-x11 now installs
a script into /etc/X11/xinit/xinitrc.d.
- Drop the weird grep rule for extensions ending in .sh
when sourcing /etc/X11/xinit/xinitrc.d
Index: Xsession
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Xsession 23 Oct 2007 18:46:49 -0000 1.8
+++ Xsession 4 Feb 2008 18:49:27 -0000 1.9
@@ -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 $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
+ exec -l $SHELL -c "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
else
# now, we see if xdm/gdm/kdm has asked for a specific environment
case $# in
@@ -54,22 +54,22 @@
exec -l $SHELL -c "xterm -geometry 80x24-0-0"
;;
gnome)
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
- exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\""
+ exec -l $SHELL -c "$SSH_AGENT gnome-session"
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"gnome-session\""
;;
kde|kde1|kde2)
- exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
+ exec $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 \"DBUS_LAUNCH twm\""
+ exec $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 \"$DBUS_LAUNCH $1\""
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
fi
;;
esac
@@ -78,11 +78,11 @@
# otherwise, take default action
if [ -x "$HOME/.xsession" ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
+ exec -l $SHELL -c "$SSH_AGENT $HOME/.xsession"
elif [ -x "$HOME/.Xclients" ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
+ exec -l $SHELL -c "$SSH_AGENT $HOME/.Xclients"
elif [ -x /etc/X11/xinit/Xclients ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
+ exec -l $SHELL -c "$SSH_AGENT /etc/X11/xinit/Xclients"
else
# should never get here; failsafe fallback
exec -l $SHELL -c "xsm"
Index: xinitrc
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinitrc 12 Oct 2007 18:27:29 -0000 1.4
+++ xinitrc 4 Feb 2008 18:49:27 -0000 1.5
@@ -18,10 +18,10 @@
# The user may have their own clients they want to run. If they don't,
# fall back to system defaults.
if [ -f $HOME/.Xclients ]; then
- exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
+ exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients || \
exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients
elif [ -f /etc/X11/xinit/Xclients ]; then
- exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
+ exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients || \
exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients
else
# Failsafe settings. Although we should never get here
Index: xinitrc-common
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xinitrc-common 12 Oct 2007 18:27:29 -0000 1.3
+++ xinitrc-common 4 Feb 2008 18:49:27 -0000 1.4
@@ -51,11 +51,7 @@
# run all system xinitrc shell scripts.
for file in /etc/X11/xinit/xinitrc.d/* ; do
- if echo $file | grep -q "\.sh$" ; then
. $file
- else
- echo "warning: $file does not end in .sh extension, ignoring"
- fi
done
# Prefix launch of session with ssh-agent if available and not already running.
@@ -68,8 +64,5 @@
fi
fi
-DBUS_LAUNCH=
-[ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"
-
CK_XINIT_SESSION=
[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-xinit.spec 12 Oct 2007 18:27:29 -0000 1.52
+++ xorg-x11-xinit.spec 4 Feb 2008 18:49:27 -0000 1.53
@@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname}
Version: 1.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
@@ -49,6 +49,11 @@
# to the xdm package.
Obsoletes: xinitrc
+# 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
+# startup.
+Conflicts: dbus < 1.1.4-3.fc9
+
%description
X.Org X11 X Window System xinit startup scripts
@@ -115,6 +120,12 @@
%{_mandir}/man1/xinit.1*
%changelog
+* Mon Feb 4 2008 Ray Strode <rstrode at redhat.com> 1.0.7-3
+- don't special case dbus-launch. dbus-x11 now installs
+ a script into /etc/X11/xinit/xinitrc.d.
+- Drop the weird grep rule for extensions ending in .sh
+ when sourcing /etc/X11/xinit/xinitrc.d
+
* Fri Oct 12 2007 Nalin Dahyabhai <nalin at redhat.com> 1.0.7-2
- Try opening the console-kit session after the user's UID has already
been granted access to the server by localuser.sh, so that console-kit-daemon
More information about the fedora-extras-commits
mailing list