rpms/sturmbahnfahrer/devel sturmbahnfahrer-1.4-esc.patch, NONE, 1.1 sources, 1.3, 1.4 sturmbahnfahrer.desktop, 1.1, 1.2 sturmbahnfahrer.spec, 1.5, 1.6 sturmbahnfahrer-1.1-de-keyb.patch, 1.2, NONE sturmbahnfahrer-1.2-fix-ode-assert.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/sturmbahnfahrer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3503

Modified Files:
	sources sturmbahnfahrer.desktop sturmbahnfahrer.spec 
Added Files:
	sturmbahnfahrer-1.4-esc.patch 
Removed Files:
	sturmbahnfahrer-1.1-de-keyb.patch 
	sturmbahnfahrer-1.2-fix-ode-assert.patch 
Log Message:
* Tue Jun  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-1
- New upstream release 1.4
- Drop all patches (all upstream now)


sturmbahnfahrer-1.4-esc.patch:

--- NEW FILE sturmbahnfahrer-1.4-esc.patch ---
--- sturmbahnfahrer-1.4/src-sturmbahnfahrer/main.cxx~	2007-06-05 17:06:21.000000000 +0200
+++ sturmbahnfahrer-1.4/src-sturmbahnfahrer/main.cxx	2007-06-05 17:06:21.000000000 +0200
@@ -572,7 +572,19 @@
   if (k==27)
   {
     if (gui && gui->hasmenu)
+    {
+      if (gui->showingleaders)
+      {
+        gui->showingleaders = false;
+        return;
+      }
+      if (gui->showinghelp)
+      {
+        gui->showinghelp = false;
+        return;
+      }
       exit(0);
+    }
     stop_game();
     gametime=0.0;
     if (gui) gui->hasmenu=true;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2006 19:58:53 -0000	1.3
+++ sources	5 Jun 2007 14:54:19 -0000	1.4
@@ -1 +1 @@
-a49ccc7b782c1ec8aab333457ba2da49  sturmbahnfahrer-1.2.tar.gz
+a861fffe67c90aa5a0cd114e8e786541  sturmbahnfahrer-1.4.tar.gz


Index: sturmbahnfahrer.desktop
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sturmbahnfahrer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sturmbahnfahrer.desktop	22 Jul 2006 04:29:44 -0000	1.1
+++ sturmbahnfahrer.desktop	5 Jun 2007 14:54:19 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
+Categories=Game;SportsGame;


Index: sturmbahnfahrer.spec
===================================================================
RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sturmbahnfahrer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sturmbahnfahrer.spec	14 Feb 2007 16:09:06 -0000	1.5
+++ sturmbahnfahrer.spec	5 Jun 2007 14:54:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sturmbahnfahrer
-Version:        1.2
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPL
@@ -8,11 +8,11 @@
 Source0:        http://www.stolk.org/%{name}/download/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Patch0:         sturmbahnfahrer-1.1-de-keyb.patch
-Patch1:         sturmbahnfahrer-1.2-fix-ode-assert.patch
+Patch0:         sturmbahnfahrer-1.4-esc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
+Requires:       hicolor-icon-theme
 
 %description
 Sturmbahnfahrer... for expert drivers only. If you want to master the obstacle
@@ -22,18 +22,21 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-sed -i 's|$(ODEPREFIX)/lib/libode.a|-lode|' Makefile
-sed -i 's|/usr/share/games/sturmbahnfahrer|%{_datadir}/%{name}|' main.cxx
+sed -i 's|$(ODEPREFIX)/lib/libode.a|-lode|' src-sturmbahnfahrer/Makefile
+sed -i 's|share/games/%{name}|share/%{name}|g' src-sturmbahnfahrer/main.cxx
 
 
 %build
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+pushd src-sturmbahnfahrer
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -I../src-common"
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd src-sturmbahnfahrer
 make install DESTDIR=$RPM_BUILD_ROOT GAMEDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}
+popd
 # 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}
@@ -41,7 +44,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE2} \
@@ -54,20 +56,18 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
-%doc JOYSTICKS LICENCE README TODO sturmbahnfahrer.keys.example
+%doc src-sturmbahnfahrer/JOYSTICKS src-sturmbahnfahrer/LICENCE
+%doc src-sturmbahnfahrer/README src-sturmbahnfahrer/TODO
+%doc src-sturmbahnfahrer/sturmbahnfahrer.keys.example
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -75,6 +75,10 @@
 
 
 %changelog
+* Tue Jun  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-1
+- New upstream release 1.4
+- Drop all patches (all upstream now)
+
 * Wed Feb 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
 - Fix a bug triggering an assert in ode-0.8
 


--- sturmbahnfahrer-1.1-de-keyb.patch DELETED ---


--- sturmbahnfahrer-1.2-fix-ode-assert.patch DELETED ---