- patches from debian

[packages/xrdp.git] / xrdp.spec

diff --git a/xrdp.spec b/xrdp.spec
index 0cadc31361b729ea7016919c27a61ce79a24ae61..f665ad2f1abf0aa1a2a941d10cb739ef419b98c7 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
@@ -11,17 +11,18 @@ Source1:    %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.xrdp.ini
 Source4:       %{name}.sesman.ini
-Source5:       %{name}.README.PLD
-Source6:       %{name}.README.PLD.pl
+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.PLD
-install %{SOURCE6} README.PLD.pl
-awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
+install %{SOURCE5} README.TLD
+install %{SOURCE6} README.TLD.pl
+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}
@@ -104,8 +106,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *.txt
-%doc README.PLD
-%doc README.PLD.pl
+%doc README.TLD
+%doc README.TLD.pl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman
 %attr(754,root,root) /etc/rc.d/init.d/xrdp
 %dir %{_sysconfdir}/%{name}