diff --git a/environmnet.patch b/environmnet.patch new file mode 100644 index 0000000..d8d2fd0 --- /dev/null +++ b/environmnet.patch @@ -0,0 +1,9 @@ +diff -ruNp a/xrdp/sesman/startwm.sh b/xrdp/sesman/startwm.sh +--- a/xrdp/sesman/startwm.sh 2009-09-20 16:07:20.000000000 -0300 ++++ b/xrdp/sesman/startwm.sh 2010-07-08 21:42:26.949667558 -0300 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/sh -l + + # change the order in line below to run to run whatever window manager you + # want, default to kde diff --git a/import.log b/import.log index cb37d70..d29f21a 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:125 xrdp-0_5_0-0_4_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.4.20090811cvs.fc12.src.rpm:1252103027 xrdp-0_5_0-0_5_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252425624 xrdp-0_5_0-0_7_03172010_fc13:HEAD:xrdp-0.5.0-0.7.03172010.fc13.src.rpm:1268924302 +xrdp-0_5_0-0_10_03172010_fc13:HEAD:xrdp-0.5.0-0.10.03172010.fc13.src.rpm:1278637624 diff --git a/xrdp.spec b/xrdp.spec index f6407dd..b0bdf7e 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -4,7 +4,7 @@ Summary: Open source remote desktop protocol (RDP) server Name: xrdp Version: 0.5.0 -Release: 0.9.%{cvs}%{?dist} +Release: 0.10.%{cvs}%{?dist} License: GPLv2+ with exceptions Group: Applications/Internet URL: http://xrdp.sourceforge.net/ @@ -25,6 +25,7 @@ Source0: http://server1.xrdp.org/xrdp/xrdp-cvs-03-17-2010.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: xrdp-pam-auth.patch +Patch1: environmnet.patch Source1: xrdp.init Source2: xrdp.sysconfig @@ -58,6 +59,9 @@ terminal server / remote desktop clients. %prep %setup -q -n %{name} %patch0 -p2 +#fix rhbz #611669 +%patch1 -p2 + # remove unused modules from xrdp login combobox %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini @@ -174,6 +178,9 @@ rm -rf %{buildroot} %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %changelog +* Thu Jul 08 2010 Itamar Reis Peixoto - 0.5.0-0.10.03172010 +- fix rhbz #611669 (load environment variables) + * Thu Mar 18 2010 Itamar Reis Peixoto - 0.5.0-0.9.03172010 - buildrequires libXfixes-devel