rpms/sturmbahnfahrer/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sturmbahnfahrer-1.1-de-keyb.patch, 1.1, 1.2 sturmbahnfahrer.spec, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Jul 31 19:58:53 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/sturmbahnfahrer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14355
Modified Files:
.cvsignore sources sturmbahnfahrer-1.1-de-keyb.patch
sturmbahnfahrer.spec
Log Message:
* Mon Jul 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
- New upstream version 1.2 with customizable keybindings
- Drop many hacks from %install as upstream has improved "make install"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jul 2006 04:29:44 -0000 1.2
+++ .cvsignore 31 Jul 2006 19:58:53 -0000 1.3
@@ -1 +1 @@
-sturmbahnfahrer-1.1.tar.gz
+sturmbahnfahrer-1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jul 2006 04:29:44 -0000 1.2
+++ sources 31 Jul 2006 19:58:53 -0000 1.3
@@ -1 +1 @@
-25d8907b234c9ebaa91c590c6fcbf9ba sturmbahnfahrer-1.1.tar.gz
+a49ccc7b782c1ec8aab333457ba2da49 sturmbahnfahrer-1.2.tar.gz
sturmbahnfahrer-1.1-de-keyb.patch:
Index: sturmbahnfahrer-1.1-de-keyb.patch
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sturmbahnfahrer-1.1-de-keyb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sturmbahnfahrer-1.1-de-keyb.patch 26 Jul 2006 07:36:06 -0000 1.1
+++ sturmbahnfahrer-1.1-de-keyb.patch 31 Jul 2006 19:58:53 -0000 1.2
@@ -1,25 +1,12 @@
---- 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 @@
+diff -ur sturmbahnfahrer-1.1/plodegui.h sturmbahnfahrer-1.2/plodegui.h
+--- sturmbahnfahrer-1.1/plodegui.h 2006-07-26 09:29:00.000000000 +0200
++++ sturmbahnfahrer-1.2/plodegui.h 2006-07-31 14:42:29.000000000 +0200
+@@ -93,7 +93,7 @@
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[2] = "STEER L KEY COMMA";
+ lines[3] = "STEER R KEY DOT";
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/devel/sturmbahnfahrer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sturmbahnfahrer.spec 26 Jul 2006 07:36:06 -0000 1.2
+++ sturmbahnfahrer.spec 31 Jul 2006 19:58:53 -0000 1.3
@@ -1,6 +1,6 @@
Name: sturmbahnfahrer
-Version: 1.1
-Release: 3%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: Simulated obstacle course for automobiles
Group: Amusements/Games
License: GPL
@@ -20,9 +20,8 @@
%prep
%setup -q
-%patch0 -p1 -z .de-keyb
+%patch0 -p1
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
@@ -32,17 +31,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/games
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/models
make install DESTDIR=$RPM_BUILD_ROOT GAMEDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}
# move the binary from /usr/games to /usr/bin
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
-# remove stupid executable bits from data files
-chmod -x `find $RPM_BUILD_ROOT%{_datadir}/%{name} -type f`
-
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
@@ -73,7 +65,7 @@
%files
%defattr(-,root,root,-)
-%doc JOYSTICKS LICENCE README TODO
+%doc JOYSTICKS LICENCE README TODO sturmbahnfahrer.keys.example
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
@@ -81,6 +73,10 @@
%changelog
+* Mon Jul 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
+- New upstream version 1.2 with customizable keybindings
+- Drop many hacks from %%install as upstream has improved "make install"
+
* 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
More information about the scm-commits
mailing list