Require tigervnc-server-minimal again, make it default.

Comment out references to X11rdp.

xrdp-0.9.1-sesman.patch

@@ -1,6 +1,5 @@
-diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
+--- xrdp-0.9.1/sesman/sesman.ini.orig	2016-12-23 04:02:47.000000000 +1100
---- xrdp-0.9.1/sesman/sesman.ini	2016-12-22 09:02:47.000000000 -0800
++++ xrdp-0.9.1/sesman/sesman.ini	2017-03-14 15:31:29.560167402 +1100
-+++ xrdp-0.9.1.sesman/sesman/sesman.ini	2017-03-09 15:45:53.303938439 -0800
 @@ -3,7 +3,7 @@
  ListenPort=3350
  EnableUserWindowManager=true
@@ -10,6 +9,25 @@ diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
  
  [Security]
  AllowRootLogin=true
+@@ -61,12 +61,12 @@
+ EnableSyslog=1
+ SyslogLevel=DEBUG
+ 
+-[X11rdp]
+-param=X11rdp
+-param=-bs
+-param=-nolisten
+-param=tcp
+-param=-uds
++#[X11rdp]
++#param=X11rdp
++#param=-bs
++#param=-nolisten
++#param=tcp
++#param=-uds
+ 
+ [Xvnc]
+ param=Xvnc
 @@ -78,7 +78,7 @@
  param=96
  

xrdp-0.9.1-xrdp-ini.patch

@@ -1,26 +1,47 @@
-diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
+--- xrdp-0.9.1/xrdp/xrdp.ini.orig	2016-12-23 04:02:47.000000000 +1100
---- xrdp-0.9.1/xrdp/xrdp.ini	2016-12-22 09:02:47.000000000 -0800
++++ xrdp-0.9.1/xrdp/xrdp.ini	2017-03-14 15:31:47.212193727 +1100
-+++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini	2017-03-09 15:47:04.828968234 -0800
+@@ -147,15 +147,15 @@
-@@ -147,16 +147,6 @@
  ; Session types
  ;
  
 -[X11rdp]
 -name=X11rdp
 -lib=libxup.so
++[Xvnc]
++name=Xvnc
++lib=libvnc.so
+ username=ask
+ password=ask
+ ip=127.0.0.1
+ port=-1
+-xserverbpp=24
+-code=10
++#xserverbpp=24
++#delay_ms=2000
+ 
+ [Xorg]
+ name=Xorg
+@@ -166,59 +166,53 @@
+ port=-1
+ code=20
+ 
+-[Xvnc]
+-name=Xvnc
+-lib=libvnc.so
 -username=ask
 -password=ask
 -ip=127.0.0.1
 -port=-1
--xserverbpp=24
++#[X11rdp]
--code=10
++#name=X11rdp
--
++#lib=libxup.so
- [Xorg]
++#username=ask
- name=Xorg
++#password=ask
- lib=libxup.so
++#ip=127.0.0.1
-@@ -176,49 +166,53 @@
++#port=-1
  #xserverbpp=24
- #delay_ms=2000
+-#delay_ms=2000
++#code=10
  
 -[console]
 -name=console
@@ -28,16 +49,7 @@ diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
 -ip=127.0.0.1
 -port=5900
 -username=na
-+[X11rdp]
+-password=ask
-+name=X11rdp
-+lib=libxup.so
-+username=ask
- password=ask
-+ip=127.0.0.1
-+port=-1
-+xserverbpp=24
-+code=10
-+
 +#[console]
 +#name=console
 +#lib=libvnc.so

xrdp.spec

@@ -28,8 +28,9 @@ BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(pixman-1)
 BuildRequires: pkgconfig(systemd)
 
-
+# tigervnc-server-minimal provides Xvnc (default for now)
-# xorgxrdp is the default backend
+Requires: tigervnc-server-minimal
+# xorgxrdp is another back end (small, so require it too)
 Requires: xorgxrdp
 Requires: /usr/libexec/Xorg
 Requires: /etc/X11/xinit/Xsession
@@ -185,6 +186,10 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
 %{_libdir}/pkgconfig/xrdp.pc
 
 %changelog
+* Tue Mar 14 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-8
+- Require tigervnc-server-minimal again, make it default
+- Comment out references to X11rdp
+
 * Fri Mar 10 2017 Pavel Roskin <plroskin@gmail.com> - 1:0.9.1-7
 - Require /etc/X11/xinit/Xsession, it's called from startwm.sh
 - Call xrdp-keygen with full path in %posttrans