- missing pam.d symlink + rm sesman.ini before install to be sure

[packages/xrdp.git] / xrdp.spec

diff --git a/xrdp.spec b/xrdp.spec
index 8f5eef24ddf391e0072ae62e787f143a0db46839..5ed0c3c231a876d40d93ffedfb93d64601f06cab 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
+Release:       1.1
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://download.sourceforge.net/xrdp/%{name}-v%{version}.tar.gz
@@ -15,13 +15,14 @@ Source5:    %{name}.README.TLD
 Source6:       %{name}.README.TLD.pl
 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
 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 +56,12 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 install %{SOURCE5} README.TLD
 install %{SOURCE6} README.TLD.pl
-awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
+awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp/xrdp.ini
 
 %build
 %{__libtoolize}
@@ -66,7 +69,6 @@ awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export CFLAGS="%{rpmcflags} -DHEIMDAL"
 %configure \
        --enable-freerdp1
 %{__make}
@@ -80,6 +82,9 @@ 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
+%{__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}
@@ -107,6 +112,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