rpms/xorg-x11-xinit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update Xsession to not use switchdesk for the hard coded kde and twm

Browse Source 
cases.
This commit is contained in:
Kristian Høgsberg 2006-10-23 18:04:35 +00:00
parent 9cff6f9adb
commit f4b656c880
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xsession
View File

@ -23,11 +23,6 @@ if [ -z "$GDMSESSION" ]; then
fi fi
fi fi
#if ! printenv PATH | grep -q /usr/X11R6/bin
#then
# PATH="${PATH}":/usr/X11R6/bin
#fi
SWITCHDESKPATH=/usr/share/switchdesk SWITCHDESKPATH=/usr/share/switchdesk
# Mandatorily source xinitrc-common, which is common code shared between the # Mandatorily source xinitrc-common, which is common code shared between the
@ -62,11 +57,11 @@ case $# in
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session" exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
;; ;;
kde|kde1|kde2) kde|kde1|kde2)
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.kde" exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH startkde"
;; ;;
twm) twm)
# fall back to twm # fall back to twm
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.twm" exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH twm"
;; ;;
*) *)
# GDM provies either a command line as the first argument or # GDM provies either a command line as the first argument or

6
xorg-x11-xinit.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.2 Version: 1.0.2
Release: 12%{?dist} Release: 13%{?dist}
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1x* %{_mandir}/man1/xinit.1x*
%changelog %changelog
* Mon Oct 23 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-13
- Update Xsession to not use switchdesk for the hard coded kde and twm
cases.
* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-12 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-12
- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - rebuilt for unwind info generation, broken in gcc-4.1.1-21