Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2020-03-24 22:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdp (Old) and /work/SRC/openSUSE:Factory/.xrdp.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp" Tue Mar 24 22:37:11 2020 rev:34 rq:787831 version:0.9.13 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2020-03-12 23:12:16.119323033 +0100 +++ /work/SRC/openSUSE:Factory/.xrdp.new.3160/xrdp.changes 2020-03-24 22:38:52.801280045 +0100 @@ -1,0 +2,15 @@ +Tue Mar 24 14:30:55 UTC 2020 - QK ZHU <[email protected]> + +- Update xrdp-bsc965647-allow-admin-choose-desktop.patch: + + Set the default session to GNOME Session for SLE. + + Update the variables to launch SLE-Classic Session. + (bsc#1166746). + +------------------------------------------------------------------- +Tue Mar 24 14:25:20 UTC 2020 - QK ZHU <[email protected]> + +- Update xrdp-bsc965647-allow-admin-choose-desktop.patch: + Add `export XDG_SESSION_TYPE=x11` in startwm.sh for SLE, since + lacking this variable in GNOME 3.34 causes GNOME crash (bsc#1159257). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp-bsc965647-allow-admin-choose-desktop.patch ++++++ --- /var/tmp/diff_new_pack.pMoXgW/_old 2020-03-24 22:38:53.649280457 +0100 +++ /var/tmp/diff_new_pack.pMoXgW/_new 2020-03-24 22:38:53.649280457 +0100 @@ -1,8 +1,8 @@ -Index: b/sesman/startwm.sh -=================================================================== ---- a/sesman/startwm.sh 2018-03-28 12:58:02.408758661 +0800 -+++ b/sesman/startwm.sh 2018-03-28 12:59:03.058439975 +0800 -@@ -7,34 +7,63 @@ +diff --git a/sesman/startwm.sh b/sesman/startwm.sh +index ad06010..2330775 100755 +--- a/sesman/startwm.sh ++++ b/sesman/startwm.sh +@@ -7,34 +7,66 @@ # exec xterm @@ -26,18 +26,21 @@ +wm_start() +{ + #Customize your preferred session mode here -+ SESSION="sle" ++ #The default session is gnome(GNOME Session) ++ #sle means SLE-Classic Session ++ SESSION="gnome" + + case $SESSION in + sle) + if [ -r /usr/bin/gnome-session ]; then -+ export GNOME_SHELL_SESSION_MODE=classic -+ export SLE_CLASSIC_MODE=1 ++ export XDG_SESSION_TYPE=x11 ++ export GNOME_SHELL_SESSION_MODE=sle-classic + /usr/bin/gnome-session --session gnome-classic + fi + ;; + gnome) + if [ -r /usr/bin/gnome-session ]; then ++ export XDG_SESSION_TYPE=x11 + /usr/bin/gnome-session + fi + ;; @@ -86,7 +89,7 @@ . ~/.profile fi fi -@@ -42,56 +71,20 @@ +@@ -42,56 +74,20 @@ pre_start() return 0 } @@ -150,7 +153,7 @@ #. /etc/environment #export PATH=$PATH #export LANG=$LANG -@@ -106,6 +99,8 @@ +@@ -106,6 +102,8 @@ wm_start() # includes # auth required pam_env.so readenv=1
