[alienarena/f15] 7.52
Tom Callaway
spot at fedoraproject.org
Fri Oct 21 20:16:38 UTC 2011
commit 5c8175a5ac12d8ce12968ad02ecfa63b560a8d80
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Fri Oct 21 16:16:37 2011 -0400
7.52
alienarena-7.52-system-ode-double.patch | 59 +++++++++++++++++++++++++++++++
alienarena.spec | 34 +++++++++---------
sources | 2 +-
3 files changed, 77 insertions(+), 18 deletions(-)
---
diff --git a/alienarena-7.52-system-ode-double.patch b/alienarena-7.52-system-ode-double.patch
new file mode 100644
index 0000000..4e2f72d
--- /dev/null
+++ b/alienarena-7.52-system-ode-double.patch
@@ -0,0 +1,59 @@
+diff -up alienarena-7.52/configure.ac.ode-double alienarena-7.52/configure.ac
+--- alienarena-7.52/configure.ac.ode-double 2011-09-18 12:21:09.000000000 -0400
++++ alienarena-7.52/configure.ac 2011-10-21 13:49:49.183559368 -0400
+@@ -305,7 +305,7 @@ AM_COND_IF([BUILD_CLIENT],
+ # is not considered to be a user-specifiable option.
+ #
+ AS_IF([ test "x$system_ode" = "xyes" ],[
+- PKG_CHECK_MODULES([ODE],[ode],,[
++ PKG_CHECK_MODULES([ODE],[ode-double],,[
+ AC_MSG_FAILURE(
+ [--with-system-libode specified, but the library or headers could not be found])
+ ])
+diff -up alienarena-7.52/configure.ode-double alienarena-7.52/configure
+--- alienarena-7.52/configure.ode-double 2011-09-18 21:32:09.000000000 -0400
++++ alienarena-7.52/configure 2011-10-21 13:54:39.928554637 -0400
+@@ -6444,12 +6444,12 @@ if test -n "$ODE_CFLAGS"; then
+ pkg_cv_ODE_CFLAGS="$ODE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ode") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode" 2>/dev/null`
++ pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode-double" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -6461,12 +6461,12 @@ if test -n "$ODE_LIBS"; then
+ pkg_cv_ODE_LIBS="$ODE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ode") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode" 2>/dev/null`
++ pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode-double" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -6487,9 +6487,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode" 2>&1`
++ ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode-double" 2>&1`
+ else
+- ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode" 2>&1`
++ ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode-double" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ODE_PKG_ERRORS" >&5
diff --git a/alienarena.spec b/alienarena.spec
index 589e04f..dff9fdc 100644
--- a/alienarena.spec
+++ b/alienarena.spec
@@ -1,39 +1,38 @@
Name: alienarena
Summary: Multiplayer retro sci-fi deathmatch game
-Version: 7.51
-Release: 2%{?dist}
+Version: 7.52
+Release: 1%{?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.51/ alienarena-7.51/
+# svn export svn://svn.icculus.org/alienarena/tags/7.52/ alienarena-7.52/
# These windows files are useless to us.
-# rm -rf alienarena-7.51/*.exe alienarena-7.51/*.dll alienarena-7.51/Tools/aaradiant.exe
+# rm -rf alienarena-7.52/*.exe alienarena-7.52/*.dll alienarena-7.52/Tools/aaradiant.exe
# These bundled zips are also pretty useless.
-# rm -rf alienarena-7.51/lib_zipfiles/
+# rm -rf alienarena-7.52/lib_zipfiles/
# We don't want the bundled ode code.
-# rm -rf alienarena-7.51/source/unix/ode/
+# rm -rf alienarena-7.52/source/unix/ode/
# arena/ botinfo/ data1/ live in the alienarena-data package
-# mkdir alienarena-data-20101216
-# 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
+# mkdir alienarena-data-20111020
+# mv alienarena-7.52/arena/ alienarena-7.52/botinfo/ alienarena-7.52/data1/ alienarena-data-20111020
+# rm -f alienarena-data-20111020/{arena,data1}/game.so
# This data tarball is used for the alienarena-data package
-# tar -cvJf alienarena-data-20110323.tar.xz alienarena-data-20110323
+# tar -cvJf alienarena-data-20111020.tar.xz alienarena-data-20111020
# This source tarball is used for the alienarena package
-# tar -cvjf alienarena-7.51.tar.bz2 alienarena-7.51
+# tar -cvjf alienarena-7.52.tar.bz2 alienarena-7.52
Source0: alienarena-%{version}.tar.bz2
Source1: alienarena.desktop
Source2: GPL.acebot.txt
Patch3: alienarena-7.45-no-qglBlitFramebufferEXT.patch
Patch4: alienarena-7.51-nodata.patch
-Patch5: alienarena-7.51-system-ode-double.patch
+Patch5: alienarena-7.52-system-ode-double.patch
URL: http://red.planetarena.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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 = 20110323
+Requires: alienarena-data = 20111020
Requires: desktop-file-utils >= 0.9, opengl-games-utils
Requires: openal-soft%{?_isa}
@@ -46,7 +45,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 = 20110323
+Requires: alienarena-data = 20111020
%description server
@@ -116,7 +115,6 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
%files
-%defattr(-,root,root,-)
%doc GPL.acebot.txt
%{_bindir}/crx
%{_bindir}/%{name}
@@ -126,12 +124,14 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
%{_defaultdocdir}/%{name}/
%files server
-%defattr(-,root,root,-)
%{_bindir}/crx-ded
%{_bindir}/%{name}-server
%{_defaultdocdir}/%{name}/
%changelog
+* Fri Oct 21 2011 Tom Callaway <spot at fedoraproject.org> - 7.52-1
+- update to 7.52
+
* Thu Mar 24 2011 Tom Callaway <spot at fedoraproject.org> - 7.51-2
- use system ode-double
- disable xf86dga to add mouse sanity
diff --git a/sources b/sources
index 99e3846..f0376c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aad48a98bae542f088313f0d2cf6d76b alienarena-7.51.tar.bz2
+e46a53b2dbc7ec16d0f5e787fb4a5fb5 alienarena-7.52.tar.bz2
More information about the scm-commits
mailing list