- patch original .ini files

[packages/xrdp.git] / xrdp.spec

diff --git a/xrdp.spec b/xrdp.spec
index 5ed0c3c231a876d40d93ffedfb93d64601f06cab..f3f3a8e490cc2de050254a4c1e99470b03fb3b77 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -9,16 +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
@@ -58,10 +58,10 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %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}
@@ -84,25 +84,18 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xrdp
 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} -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sesman.ini
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sesman.ini
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la,so}
+%{__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
 
@@ -135,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