[xrdp/f13/master] - Load a default keymap when current keymap doesnt exist

[Itamar Reis Peixoto]

commit fbe3342b28bf60eeef66bc58d154392c93335061
Author: Itamar Reis Peixoto <itamar at itamar.ispbrasil.com.br>
Date:   Mon Oct 4 03:13:32 2010 -0300

    - Load a default keymap when current keymap doesnt exist

 .gitignore              |    1 +
 05-default-keymap.patch |   18 ++++++++++++++++++
 environmnet.patch       |    2 +-
 xrdp.spec               |   10 ++++++++--
 4 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b365fa..a7c54aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xrdp-cvs-03-17-2010.tar.gz
+/xrdp-cvs-03-17-2010.tar.gz
diff --git a/05-default-keymap.patch b/05-default-keymap.patch
new file mode 100644
index 0000000..ff99385
--- /dev/null
+++ b/05-default-keymap.patch
@@ -0,0 +1,18 @@
+diff --git a/xrdp/lang.c b/xrdp/lang.c
+index 751d2ba..7ae351f 100644
+--- a/xrdp/lang.c
++++ b/xrdp/lang.c
+@@ -234,6 +234,13 @@ get_keymaps(int keylayout, struct xrdp_keymap* keymap)
+       g_file_close(fd);
+     }
+   }
++  else if (keylayout != 0x409)
++  {
++    g_free(filename);
++    g_writeln("keymap for 0x%4.4x was not found. Falling back to 0x0409 instead",
++	      keylayout);
++    return get_keymaps(0x409, keymap);
++  }
+   g_free(filename);
+   return 0;
+ }
diff --git a/environmnet.patch b/environmnet.patch
index d8d2fd0..e7ccc0d 100644
--- a/environmnet.patch
+++ b/environmnet.patch
@@ -3,7 +3,7 @@ diff -ruNp a/xrdp/sesman/startwm.sh b/xrdp/sesman/startwm.sh
 +++ b/xrdp/sesman/startwm.sh	2010-07-08 21:42:26.949667558 -0300
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/sh -l
++#!/bin/bash -l
  
  # change the order in line below to run to run whatever window manager you
  # want, default to kde
diff --git a/xrdp.spec b/xrdp.spec
index b0bdf7e..507cccb 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.10.%{cvs}%{?dist}
+Release:   0.11.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -26,6 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: xrdp-pam-auth.patch
 Patch1: environmnet.patch
+Patch2: 05-default-keymap.patch
 
 Source1: xrdp.init
 Source2: xrdp.sysconfig
@@ -40,7 +41,7 @@ Buildrequires:  libX11-devel
 BuildRequires:  libXfixes-devel
 
 #vnc-server provides Xvnc (tigervnc-server in fedora)
-Requires: vnc-server
+Requires: tigervnc-server-minimal
 
 #initscripts requires
 Requires(post): chkconfig
@@ -61,6 +62,8 @@ terminal server / remote desktop clients.
 %patch0 -p2
 #fix rhbz #611669
 %patch1 -p2
+#fix keymap
+%patch2 -p1
 
 
 # remove unused modules from xrdp login combobox
@@ -178,6 +181,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Mon Oct 04 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.11.03172010
+- Load a default keymap when current keymap doesnt exist
+
 * Thu Jul 08 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.10.03172010
 - fix rhbz #611669 (load environment variables)