[x2goserver] Add patch to fix keyboard setting (bug #1033876)

[Orion Poplawski]

commit e84224c20fa1fe72a230540610bd4c7f0ef05801
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Nov 27 17:29:46 2013 -0700

    Add patch to fix keyboard setting (bug #1033876)

 x2goserver-keyboard.patch |   12 ++++++++++++
 x2goserver.spec           |    5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/x2goserver-keyboard.patch b/x2goserver-keyboard.patch
new file mode 100644
index 0000000..0c74541
--- /dev/null
+++ b/x2goserver-keyboard.patch
@@ -0,0 +1,12 @@
+diff -up x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent
+--- x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard	2013-11-27 16:33:59.710404632 -0700
++++ x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent	2013-11-27 17:24:00.999159217 -0700
+@@ -331,7 +331,7 @@ X2GO_SND_PORT=1024
+ 
+ $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null
+ 
+-if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then
++if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then
+ 	$X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command"
+ 	mkdir -p ${SESSION_DIR}/keyboard
+ fi
diff --git a/x2goserver.spec b/x2goserver.spec
index 556375b..8e49aab 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -19,6 +19,9 @@ Source2:        x2gocleansessions.init
 Patch0:         x2goserver-pwgen.patch
 # Use mktemp instead of tempfile
 Patch1:         x2goserver-mktemp.patch
+# Fix keyboard setting
+# https://bugzilla.redhat.com/show_bug.cgi?id=1033876
+Patch2:		x2goserver-keyboard.patch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 %if 0%{?fedora}
@@ -86,6 +89,7 @@ server).
 %setup -q
 %patch0 -p1 -b .pwgen
 %patch1 -p1 -b .mktemp
+%patch2 -p1 -b .keyboard
 
 # Set pach
 #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,'
@@ -229,6 +233,7 @@ exit 0
 * Wed Nov 27 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.8-2
 - Use mktemp instead of tempfile
 - BR xorg-x11-xinit for Xsession.d link creation
+- Add patch to fix keyboard setting (bug #1033876)
 
 * Sat Nov 23 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.8-1
 - Update to 4.0.1.8