- apply config patch, include startwm.sh script

diff --git a/xrdp.spec b/xrdp.spec
index f3f3a8e490cc2de050254a4c1e99470b03fb3b77..a16b417267740bdf914ba77493d5d4f8145a08f8 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -2,7 +2,7 @@ Summary:        Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp
 Version:       0.6.1
-Release:       1.1
+Release:       2
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://download.sourceforge.net/xrdp/%{name}-v%{version}.tar.gz
@@ -11,6 +11,7 @@ Source1:      %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD
 Source4:       %{name}.README.TLD.pl
+Source5:       startwm.sh
 Patch0:                format-security.patch
 Patch1:                build.patch
 Patch2:                link.patch
@@ -59,6 +60,7 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 install %{SOURCE3} README.TLD
 install %{SOURCE4} README.TLD.pl
@@ -85,6 +87,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sesman
 %{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
 %{__ln} -s sesman $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la}
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
 
 %post
 /sbin/chkconfig --add xrdp
@@ -117,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/%{name}/km-0410.ini
 %{_sysconfdir}/%{name}/km-0419.ini
 %{_sysconfdir}/%{name}/km-041d.ini
+%attr(755,root,root) %{_sysconfdir}/xrdp/startwm.sh
 %attr(755,root,root) %{_bindir}/xrdp-dis
 %attr(755,root,root) %{_bindir}/xrdp-genkeymap
 %attr(755,root,root) %{_bindir}/xrdp-keygen