metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Try to fix bug #1105202.

Browse Source
This commit is contained in:
Bojan Smojver 2015-06-04 16:29:32 +10:00
parent cfb3ac7ea3
commit 7acfd85491
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xrdp.spec
View File

@ -2,7 +2,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp Name: xrdp
Epoch: 1 Epoch: 1
Version: 0.6.1 Version: 0.6.1
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
Group: Applications/Internet Group: Applications/Internet
URL: http://xrdp.sourceforge.net/ URL: http://xrdp.sourceforge.net/
@ -18,6 +18,7 @@ Patch4: xrdp-0.6.1-syslog-format.patch
Patch5: xrdp-0.6.1-memset.patch Patch5: xrdp-0.6.1-memset.patch
Patch6: xrdp-0.6.1-implicit-decl.patch Patch6: xrdp-0.6.1-implicit-decl.patch
Patch7: xrdp-0.6.1-vnc-delay.patch Patch7: xrdp-0.6.1-vnc-delay.patch
Patch8: xrdp-0.6.1-sesman-ini.patch
Source1: xrdp.service Source1: xrdp.service
Source2: xrdp-sesman.service Source2: xrdp-sesman.service
@ -57,6 +58,7 @@ terminal server / remote desktop clients.
%patch5 -p1 -b .memset %patch5 -p1 -b .memset
%patch6 -p1 -b .implicit-decl %patch6 -p1 -b .implicit-decl
%patch7 -p1 -b .vnc-delay %patch7 -p1 -b .vnc-delay
%patch8 -p1 -b .sesman-ini
# remove unused modules from xrdp login combobox # remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@ -72,9 +74,6 @@ terminal server / remote desktop clients.
echo '#!/bin/bash -l echo '#!/bin/bash -l
. %{_sysconfdir}/xrdp/startwm.sh' > sesman/startwm-bash.sh . %{_sysconfdir}/xrdp/startwm.sh' > sesman/startwm-bash.sh
# set 'bash -l' based startwm script as default
%{__sed} -i -e 's/DefaultWindowManager=startwm.sh/DefaultWindowManager=startwm-bash.sh/' sesman/sesman.ini
%build %build
./bootstrap ./bootstrap
@ -183,6 +182,10 @@ fi
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
%changelog %changelog
* Thu Jun 4 2015 Bojan Smojver <bojan@rexursive.com> - 1:0.6.1-10
- remove -ac from X server calls: bug #1105202
- put other sesman.ini changes into a patch
* Fri May 15 2015 Bojan Smojver <bojan@rexursive.com> - 1:0.6.1-9 * Fri May 15 2015 Bojan Smojver <bojan@rexursive.com> - 1:0.6.1-9
- hopefully better service dependencies - hopefully better service dependencies