X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=xrdp.spec;h=f3f3a8e490cc2de050254a4c1e99470b03fb3b77;hb=9f57dfdbb9f2adb8610089373566bc8246d632d6;hp=d17eb4cf2d7f5414b96d3590b127d124ae7b3b0c;hpb=64b912db915190fd50443dd67f200ccebd2a683d;p=packages%2Fxrdp.git

diff --git a/xrdp.spec b/xrdp.spec
index d17eb4c..f3f3a8e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -9,13 +9,16 @@ 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
 Patch0:		format-security.patch
 Patch1:		build.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
@@ -52,10 +55,13 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-install %{SOURCE5} README.TLD
-install %{SOURCE6} README.TLD.pl
-awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp/xrdp.ini
+install %{SOURCE3} README.TLD
+install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}
@@ -76,24 +82,20 @@ 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}
 
 %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
 
@@ -103,6 +105,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
@@ -125,14 +128,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