[alienarena/f15/master] update to 7.51

[Tom Callaway]

commit b464144b4dae953703edd160bcab0b801a634a3a
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Mar 24 12:42:20 2011 -0400

    update to 7.51

 alienarena.spec |   44 +++++++++++++++++++++++++-------------------
 sources         |    2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/alienarena.spec b/alienarena.spec
index a09e9e3..589e04f 100644
--- a/alienarena.spec
+++ b/alienarena.spec
@@ -1,40 +1,39 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
-Version:	7.50
+Version:	7.51
 Release:	2%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
 # Upstream seems too inept to provide a simple source only tarball, so we use svn.
-#   svn export svn://svn.icculus.org/alienarena/tags/7.50/ alienarena-7.50/
+#   svn export svn://svn.icculus.org/alienarena/tags/7.51/ alienarena-7.51/
 # These windows files are useless to us.
-#   rm -rf alienarena-7.50/*.exe alienarena-7.50/*.dll alienarena-7.50/Tools/aaradiant.exe 
+#   rm -rf alienarena-7.51/*.exe alienarena-7.51/*.dll alienarena-7.51/Tools/aaradiant.exe 
 # These bundled zips are also pretty useless.
-#   rm -rf alienarena-7.50/lib_zipfiles/
+#   rm -rf alienarena-7.51/lib_zipfiles/
+# We don't want the bundled ode code.
+#   rm -rf alienarena-7.51/source/unix/ode/
 # arena/ botinfo/ data1/ live in the alienarena-data package
 #   mkdir alienarena-data-20101216
-#   mv alienarena-7.50/arena/ alienarena-7.50/botinfo/ alienarena-7.50/data1/ alienarena-data-20101216/
-#   rm -f alienarena-data-20101216/{arena,data1}/game.so
+#   mv alienarena-7.51/arena/ alienarena-7.51/botinfo/ alienarena-7.51/data1/ alienarena-data-20110323/
+#   rm -f alienarena-data-20110323/{arena,data1}/game.so
 # This data tarball is used for the alienarena-data package
-#   tar -cvJf alienarena-data-20101216.tar.xz alienarena-data-20101216
+#   tar -cvJf alienarena-data-20110323.tar.xz alienarena-data-20110323
 # This source tarball is used for the alienarena package
-#   tar -cvjf alienarena-7.50.tar.bz2 alienarena-7.50
+#   tar -cvjf alienarena-7.51.tar.bz2 alienarena-7.51
 Source0:	alienarena-%{version}.tar.bz2
 Source1:	alienarena.desktop
 Source2:	GPL.acebot.txt
-Source3:	alienarena.png
 Patch3:		alienarena-7.45-no-qglBlitFramebufferEXT.patch
-Patch4:		alienarena-7.50-nodata.patch
-# Ragdolls: added a NaN check which seems to solve the ODE assertion error problem
-# http://svn.icculus.org/alienarena?view=rev&revision=2286
-Patch5:		alienarena-7.50-NAN.patch
+Patch4:		alienarena-7.51-nodata.patch
+Patch5:		alienarena-7.51-system-ode-double.patch
 URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
+BuildRequires:	libX11-devel, libXext-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel
 BuildRequires:	libvorbis-devel, openal-soft-devel, ode-devel, freetype-devel
 BuildRequires:	desktop-file-utils
-Requires:	alienarena-data = 20101216
+Requires:	alienarena-data = 20110323
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
 Requires:	openal-soft%{?_isa}
 
@@ -47,7 +46,7 @@ of play, loads of mutators, built-in bots, multiple player characters and weapon
 %package server
 Group:      Amusements/Games
 Summary:    Dedicated server for alienarena, the FPS game
-Requires:   alienarena-data = 20101216
+Requires:   alienarena-data = 20110323
 
 
 %description server
@@ -63,7 +62,7 @@ This is the dedicated server.
 
 %patch3 -p1 -b .no-qglBlitFramebufferEXT
 %patch4 -p1 -b .nodata
-%patch5 -p1 -b .NAN
+%patch5 -p1 -b .ode-double
 
 # Copy license clarification for acebot
 cp -p %{SOURCE2} .
@@ -82,7 +81,7 @@ sed -i "s|\"libopenal.so\"|\"$LIBOPENAL\"|g" source/unix/qal_unix.c
 %build
 export PTHREAD_LIBS="-lpthread"
 export PTHREAD_CFLAGS="-pthread" 
-%configure
+%configure --with-system-libode --without-xf86dga
 make %{?_smp_mflags}
 
 # make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX="%{_prefix}" \
@@ -99,7 +98,7 @@ desktop-file-install --vendor "fedora"			\
 	%{SOURCE1}
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+mv %{buildroot}%{_datadir}/icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 # Fedora's little opengl checker
 ln -s opengl-game-wrapper.sh %{buildroot}/%{_bindir}/%{name}-wrapper
@@ -133,6 +132,13 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 %{_defaultdocdir}/%{name}/
 
 %changelog
+* Thu Mar 24 2011 Tom Callaway <spot at fedoraproject.org> - 7.51-2
+- use system ode-double
+- disable xf86dga to add mouse sanity
+
+* Wed Mar 23 2011 Tom Callaway <spot at fedoraproject.org> - 7.51-1
+- update to 7.51
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.50-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f277a68..99e3846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f43a8e2ff95c03aae5bf1e92f2a73ed8  alienarena-7.50.tar.bz2
+aad48a98bae542f088313f0d2cf6d76b  alienarena-7.51.tar.bz2