[machineball] Rebuild for ode-0.13.1

[Hans de Goede]

commit 6178a141bac15cd89ddaedebb12abc98a0de3c42
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Oct 29 16:01:45 2014 +0100

    Rebuild for ode-0.13.1
    
    - Fix the game running at the wrong speed

 machineball-1.0-timer-fix.patch |   11 +++++++++++
 machineball.spec                |   17 ++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/machineball-1.0-timer-fix.patch b/machineball-1.0-timer-fix.patch
new file mode 100644
index 0000000..faa162d
--- /dev/null
+++ b/machineball-1.0-timer-fix.patch
@@ -0,0 +1,11 @@
+--- machineball-src/timer.h	2014-10-29 15:54:40.401341699 +0100
++++ machineball-src.new/timer.h	2014-10-29 15:41:03.004664290 +0100
+@@ -20,7 +20,7 @@
+   unsigned long ticks;
+   double ticks_per_sec;
+   
+-  void install(double tps=596590.5) { install_int_ex(tickf, (long int)((double)1193181.0/tps)); ticks_per_sec=tps; ticks=0; }
++  void install(double tps=100) { install_int_ex(tickf, BPS_TO_TIMER(tps)); ticks_per_sec=tps; ticks=0; }
+   double seconds(void) { return (double)ticks/ticks_per_sec; }
+   void reset(void) { ticks=0; }
+   /* race proof code to get the seconds and then reset the ticks, without
diff --git a/machineball.spec b/machineball.spec
index 0d52568..13f82c6 100644
--- a/machineball.spec
+++ b/machineball.spec
@@ -1,6 +1,6 @@
 Name:           machineball
 Version:        1.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        A futuristic ball game with simple rules
 Group:          Amusements/Games
 License:        GPL+
@@ -10,6 +10,7 @@ Source1:        machineball.desktop
 Patch0:         machineball-fixes.patch
 Patch1:         machineball-config-only-once.patch
 Patch2:         machineball-1.0-ode.patch
+Patch3:         machineball-1.0-timer-fix.patch
 BuildRequires:  alleggl-devel libGLU-devel ode-devel dumb-devel allegro-tools
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
@@ -26,6 +27,8 @@ missiles and blast the ball into the goal. Be creative.
 %patch0 -p1 -z .fixes
 %patch1 -p1 -z .cfg-only-once
 %patch2 -p0 -z .ode
+%patch3 -p1
+
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -39,9 +42,6 @@ ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
-  --vendor fedora            \
-%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -66,18 +66,17 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/%{name}*
-%if 0%{?fedora} && 0%{?fedora} < 19
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
 %{_datadir}/applications/%{name}.desktop
-%endif
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
 
 %changelog
+* Wed Oct 29 2014 Hans de Goede <hdegoede at redhat.com> - 1.0-20
+- Rebuild for ode-0.13.1
+- Fix the game running at the wrong speed
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild