X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=xrdp.spec;h=dc65ae3f91bb4a1e9712d9448665020305199967;hb=98c0c55bc4aa046b870e942a99dac55d77e357d7;hp=8f5eef24ddf391e0072ae62e787f143a0db46839;hpb=be109bc3a296bff1e7e56ea100c568e60bcb72fc;p=packages%2Fxrdp.git

diff --git a/xrdp.spec b/xrdp.spec
index 8f5eef2..dc65ae3 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -2,26 +2,28 @@ Summary:	Remote desktop server
 Summary(pl.UTF-8):	Serwer remote desktop
 Name:		xrdp
 Version:	0.6.1
-Release:	1
+Release:	3
 License:	GPL
 Group:		X11/Applications/Networking
 Source0:	http://download.sourceforge.net/xrdp/%{name}-v%{version}.tar.gz
 # Source0-md5:	26099c6588943262023607c1b4e774d8
 Source1:	%{name}.init
 Source2:	%{name}.pamd
-Source3:	%{name}.xrdp.ini
-Source4:	%{name}.sesman.ini
-Source5:	%{name}.README.TLD
-Source6:	%{name}.README.TLD.pl
+Source3:	%{name}.README.TLD
+Source4:	%{name}.README.TLD.pl
+Source5:	startwm.sh
 Patch0:		format-security.patch
 Patch1:		build.patch
-Patch2:		heimdal.patch
-Patch3:		link.patch
+Patch2:		link.patch
+Patch3:		quiet_start.patch
+Patch4:		default_keymap.patch
+Patch5:		pidfile_early.patch
+Patch6:		reuse_session.patch
+Patch7:		config.patch
 URL:		http://xrdp.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	freerdp-devel
-BuildRequires:	heimdal-devel >= 1.5.3-4
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
@@ -55,10 +57,13 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
-install %{SOURCE5} README.TLD
-install %{SOURCE6} README.TLD.pl
-awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
+install %{SOURCE3} README.TLD
+install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}
@@ -66,7 +71,6 @@ awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export CFLAGS="%{rpmcflags} -DHEIMDAL"
 %configure \
 	--enable-freerdp1
 %{__make}
@@ -80,24 +84,22 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},pam.d,rc.d/init.d}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xrdp
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sesman
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sesman.ini
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la,so}
+%{__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/ldconfig
 /sbin/chkconfig --add xrdp
 %service xrdp restart "xrdp server"
 
-%postun -p /sbin/ldconfig
-
 %preun
 if [ "$1" = "0" ]; then
 	%service xrdp stop
 	/sbin/chkconfig --del xrdp
 fi
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.TLD
 %doc README.TLD.pl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman
+%attr(640,root,root) /etc/pam.d/xrdp-sesman
 %attr(754,root,root) /etc/rc.d/init.d/xrdp
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/xrdp.ini
@@ -118,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
@@ -129,14 +133,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/xrdp-sesman
 %attr(755,root,root) %{_sbindir}/xrdp-sessvc
 %dir %{_libdir}/xrdp
-%attr(755,root,root) %{_libdir}/xrdp/libcommon.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libmc.so.*
-%attr(755,root,root) %{_libdir}/xrdp/librdp.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libscp.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libvnc.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libxrdp.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libxrdpfreerdp1.so.*
-%attr(755,root,root) %{_libdir}/xrdp/libxup.so.*
+%attr(755,root,root) %{_libdir}/xrdp/libcommon.so*
+%attr(755,root,root) %{_libdir}/xrdp/libmc.so*
+%attr(755,root,root) %{_libdir}/xrdp/librdp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libscp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libvnc.so*
+%attr(755,root,root) %{_libdir}/xrdp/libxrdp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libxrdpfreerdp1.so*
+%attr(755,root,root) %{_libdir}/xrdp/libxup.so*
 %dir %{_datadir}/xrdp
 %{_datadir}/xrdp/ad24b.bmp
 %{_datadir}/xrdp/ad256.bmp