rpms/glest/F-8 glest-2.0.1-keyboard.patch, NONE, 1.1 glest.spec, 1.13, 1.14

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/pkgs/rpms/glest/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459/F-8

Modified Files:
	glest.spec 
Added Files:
	glest-2.0.1-keyboard.patch 
Log Message:
* Thu Dec 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-5
- fix keyboard (bug 411911)


glest-2.0.1-keyboard.patch:

--- NEW FILE glest-2.0.1-keyboard.patch ---
diff -up ./source/shared_lib/sources/platform/sdl/window.cpp.keyboard ./source/shared_lib/sources/platform/sdl/window.cpp
--- ./source/shared_lib/sources/platform/sdl/window.cpp.keyboard	2005-10-22 18:37:26.000000000 +0200
+++ ./source/shared_lib/sources/platform/sdl/window.cpp	2007-12-06 08:49:38.000000000 +0100
@@ -223,6 +223,78 @@ char Window::getKey(SDL_keysym keysym) {
 			return vkReturn;
 		case SDLK_BACKSPACE:
 			return vkBack;
+		case SDLK_0:
+			return '0';
+		case SDLK_1:
+			return '1';
+		case SDLK_2:
+			return '2';
+		case SDLK_3:
+			return '3';
+		case SDLK_4:
+			return '4';
+		case SDLK_5:
+			return '5';
+		case SDLK_6:
+			return '6';
+		case SDLK_7:
+			return '7';
+		case SDLK_8:
+			return '8';
+		case SDLK_9:
+			return '9';
+		case SDLK_a:
+			return 'A';
+		case SDLK_b:
+			return 'B';
+		case SDLK_c:
+			return 'C';
+		case SDLK_d:
+			return 'D';
+		case SDLK_e:
+			return 'E';
+		case SDLK_f:
+			return 'F';
+		case SDLK_g:
+			return 'G';
+		case SDLK_h:
+			return 'H';
+		case SDLK_i:
+			return 'I';
+		case SDLK_j:
+			return 'J';
+		case SDLK_k:
+			return 'K';
+		case SDLK_l:
+			return 'L';
+		case SDLK_m:
+			return 'M';
+		case SDLK_n:
+			return 'N';
+		case SDLK_o:
+			return 'O';
+		case SDLK_p:
+			return 'P';
+		case SDLK_q:
+			return 'Q';
+		case SDLK_r:
+			return 'R';
+		case SDLK_s:
+			return 'S';
+		case SDLK_t:
+			return 'T';
+		case SDLK_u:
+			return 'U';
+		case SDLK_v:
+			return 'V';
+		case SDLK_w:
+			return 'W';
+		case SDLK_x:
+			return 'X';
+		case SDLK_y:
+			return 'Y';
+		case SDLK_z:
+			return 'Z';
 		default:
 			char c = (char) keysym.unicode;
 			if(c > 0)


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/glest.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glest.spec	1 Dec 2007 15:57:47 -0000	1.13
+++ glest.spec	6 Dec 2007 07:55:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        2.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -9,6 +9,7 @@
 Source0:        http://dl.sf.net/glest/glest_source_%{version}.zip
 Source1:        glest.sh
 Patch0:         glest-2.0.0-unicode.patch
+Patch1:         glest-2.0.1-keyboard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -35,6 +36,9 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .unicode
+# https://bugzilla.redhat.com/411911
+%patch1 -p0 -b .keyboard
+
 find . -type f | xargs sed -i -e "s/\r//g" 
 #find . -type f | while read file; do
 #  grep -qs "\r\n" $file && dos2unix $file
@@ -97,6 +101,9 @@
 
 
 %changelog
+* Thu Dec 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-5
+- fix keyboard (bug 411911)
+
 * Sat Dec 01 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-4
 - add a symlink to the "scenarios" directory (bug 403401)