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

diff --git a/xrdp.spec b/xrdp.spec
index 8f5eef2..f665ad2 100644
--- 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}