From 6fc88eeb6884d4ad2d9b5109e3782b6fe9f839d8 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Fri, 1 Jan 2021 12:28:47 +1100
Subject: [PATCH] Use /usr/libexec/Xorg for Xorg session on Fedora and RHEL8+.

---
 xrdp-0.9.15-sesman-ini.patch | 12 ++++++++++++
 xrdp.spec                    |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 xrdp-0.9.15-sesman-ini.patch

diff --git a/xrdp-0.9.15-sesman-ini.patch b/xrdp-0.9.15-sesman-ini.patch
new file mode 100644
index 0000000..4575e60
--- /dev/null
+++ b/xrdp-0.9.15-sesman-ini.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.15-v/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini
+--- xrdp-0.9.15-v/sesman/sesman.ini	2020-12-29 01:06:46.000000000 +1100
++++ xrdp-0.9.15/sesman/sesman.ini	2021-01-01 12:20:29.626573656 +1100
+@@ -94,7 +94,7 @@
+ ; CentOS 7              :  param=/usr/bin/Xorg or param=Xorg
+ ; CentOS 8              :  param=/usr/libexec/Xorg
+ ;
+-param=Xorg
++param=/usr/libexec/Xorg
+ ; Leave the rest paramaters as-is unless you understand what will happen.
+ param=-config
+ param=xrdp/xorg.conf
diff --git a/xrdp.spec b/xrdp.spec
index 565a039..b01d9ff 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -32,6 +32,9 @@ Patch4:    xrdp-0.9.10-scripts-libexec.patch
 Patch5:    xrdp-0.9.6-script-interpreter.patch
 Patch6:    xrdp-0.9.15-arch.patch
 Patch7:    xrdp-0.9.14-vnc-uninit.patch
+%if 0%{?fedora} >= 32 || 0{?rhel} >= 8
+Patch8:    xrdp-0.9.15-sesman-ini.patch
+%endif
 
 BuildRequires: gcc
 BuildRequires: libX11-devel