rpms/sturmbahnfahrer/FC-5 sturmbahnfahrer-1.1-de-keyb.patch, NONE, 1.1 sturmbahnfahrer.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/sturmbahnfahrer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568

Modified Files:
	sturmbahnfahrer.spec 
Added Files:
	sturmbahnfahrer-1.1-de-keyb.patch 
Log Message:
* Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-3
- Added a patch to call the left and right keys COMMA and POINT instead of
  LESSTHEN and GREATERTHEN, so that the text is correct for non qwerty
  keyboards too. And add a binding for normal brake to the Y key for more
  convenient controls with a German (QWERTZ) keyboard.
  Upstream has been notified that the current hardcoded keys are awkward
  with non qwerty keyboards so that upstream can create a proper fix.


sturmbahnfahrer-1.1-de-keyb.patch:

--- NEW FILE sturmbahnfahrer-1.1-de-keyb.patch ---
--- sturmbahnfahrer-1.1/plodegui.h~	2006-07-26 09:15:12.000000000 +0200
+++ sturmbahnfahrer-1.1/plodegui.h	2006-07-26 09:15:12.000000000 +0200
@@ -93,9 +93,9 @@
       else
       {
         lines[0] = "ACCEL    KEY A";
-        lines[1] = "BRAKE    KEY Z";
-        lines[2] = "STEER L  KEY LESSTHAN";
-        lines[3] = "STEER R  KEY GREATERTHAN";
+        lines[1] = "BRAKE    KEY Z OR KEY Y";
+        lines[2] = "STEER L  KEY COMMA";
+        lines[3] = "STEER R  KEY POINT";
         lines[4] = "ACTION   KEY SPACEBAR";
         lines[5] = "EBRAKE   KEY B OR KEY TAB";
       }
--- sturmbahnfahrer-1.1/controllerkey.cxx~	2006-07-26 09:15:34.000000000 +0200
+++ sturmbahnfahrer-1.1/controllerkey.cxx	2006-07-26 09:15:34.000000000 +0200
@@ -62,6 +62,7 @@
 {
   if (k=='a') { key_accel = down; return; }
   if (k=='z') { key_brake = down; return; }
+  if (k=='y') { key_brake = down; return; }
   if (k==',') { key_steerl = down; return; }
   if (k=='.') { key_steerr = down; return; }
   if (k==' ') { key_action = down; return; }


Index: sturmbahnfahrer.spec
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/FC-5/sturmbahnfahrer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sturmbahnfahrer.spec	22 Jul 2006 04:29:44 -0000	1.1
+++ sturmbahnfahrer.spec	26 Jul 2006 07:43:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sturmbahnfahrer
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPL
@@ -8,6 +8,7 @@
 Source0:        http://www.stolk.org/%{name}/download/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
+Patch0:         sturmbahnfahrer-1.1-de-keyb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .de-keyb
 sed -i 's|$(ODEPREFIX)/lib/libode.a|-lode|' Makefile
 sed -i 's| -lXmu -lXi -lX11 | |' Makefile
 sed -i 's|/usr/share/games/sturmbahnfahrer|%{_datadir}/%{name}|' main.cxx
@@ -79,6 +81,14 @@
 
 
 %changelog
+* Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-3
+- Added a patch to call the left and right keys COMMA and POINT instead of
+  LESSTHEN and GREATERTHEN, so that the text is correct for non qwerty
+  keyboards too. And add a binding for normal brake to the Y key for more
+  convenient controls with a German (QWERTZ) keyboard.
+  Upstream has been notified that the current hardcoded keys are awkward
+  with non qwerty keyboards so that upstream can create a proper fix.
+
 * Wed Jul 19 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-2
 - Add missing BR: alsa-lib-devel
 - Stop linking with the unused libs: -lXmu -lXi -lX11 (-lX11 is used