From 9a3b27705c233f569b5363ca19ba9dff6fa30296 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 29 Apr 2021 19:32:41 -0400 Subject: [PATCH] Use correct binary for the KDE Plasma session (#1954847) This changes Xsession and Xclients to call to the KDE Plasma X11 session binary directly, rather than assuming that "startkde" will start an X11 session. --- Xclients | 2 +- Xsession | 4 ++-- xorg-x11-xinit.spec | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Xclients b/Xclients index 1d6d6f7..0dcd7bd 100644 --- a/Xclients +++ b/Xclients @@ -10,7 +10,7 @@ GSESSION="$(type -p gnome-session)" MSESSION="$(type -p mate-session)" -STARTKDE="$(type -p startkde)" +STARTKDE="$(type -p startplasma-x11)" STARTLXDE="$(type -p startlxde)" # check to see if the user has a preferred desktop diff --git a/Xsession b/Xsession index 2cffea1..85071ee 100644 --- a/Xsession +++ b/Xsession @@ -60,8 +60,8 @@ case $# in exec -l $SHELL -c gnome-session exec /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" ;; - kde|kde1|kde2) - exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\"" + kde|kde1|kde2|kdeplasma) + exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startplasma-x11\"" ;; twm) # fall back to twm diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec index 7f7b626..ef4c1da 100644 --- a/xorg-x11-xinit.spec +++ b/xorg-x11-xinit.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.4.0 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT URL: https://www.x.org @@ -119,6 +119,9 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Thu Apr 29 2021 Neal Gompa - 1.4.0-10 +- Use correct binary for the KDE Plasma session (#1954847) + * Thu Jan 28 2021 Fedora Release Engineering - 1.4.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild