[alienarena/f13/master] update to 7.51
Tom Callaway
spot at fedoraproject.org
Thu Mar 24 16:39:40 UTC 2011
commit 80a53095783cce3699bf8cad7a8b85ad4e8eb570
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Thu Mar 24 12:41:04 2011 -0400
update to 7.51
alienarena-7.51-nodata.patch | 21 +++++++++++
alienarena-7.51-system-ode-double.patch | 59 +++++++++++++++++++++++++++++++
alienarena.spec | 49 +++++++++++++++----------
sources | 2 +-
4 files changed, 110 insertions(+), 21 deletions(-)
---
diff --git a/alienarena-7.51-nodata.patch b/alienarena-7.51-nodata.patch
new file mode 100644
index 0000000..d5e2342
--- /dev/null
+++ b/alienarena-7.51-nodata.patch
@@ -0,0 +1,21 @@
+diff -up alienarena-7.51/Makefile.in.nodata alienarena-7.51/Makefile.in
+--- alienarena-7.51/Makefile.in.nodata 2011-03-23 17:20:30.076470002 -0400
++++ alienarena-7.51/Makefile.in 2011-03-23 17:21:15.927470000 -0400
+@@ -3843,7 +3843,7 @@ distcleancheck: distclean
+ exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(DATA)
++all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgdatadir)"; do \
+@@ -3896,7 +3896,7 @@ info: info-recursive
+ info-am:
+
+ install-data-am: install-data-local install-dist_docDATA \
+- install-dist_iconDATA install-nobase_dist_pkgdataDATA
++ install-dist_iconDATA
+
+ install-dvi: install-dvi-recursive
+
diff --git a/alienarena-7.51-system-ode-double.patch b/alienarena-7.51-system-ode-double.patch
new file mode 100644
index 0000000..d6f3078
--- /dev/null
+++ b/alienarena-7.51-system-ode-double.patch
@@ -0,0 +1,59 @@
+diff -up alienarena-7.51/configure.ac.BAD alienarena-7.51/configure.ac
+--- alienarena-7.51/configure.ac.BAD 2011-03-24 10:59:58.490054999 -0400
++++ alienarena-7.51/configure.ac 2011-03-24 11:00:06.306055413 -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.51/configure.BAD alienarena-7.51/configure
+--- alienarena-7.51/configure.BAD 2011-03-24 11:01:39.411054929 -0400
++++ alienarena-7.51/configure 2011-03-24 11:01:44.281055001 -0400
+@@ -6426,12 +6426,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`
+ else
+ pkg_failed=yes
+ fi
+@@ -6442,12 +6442,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`
+ else
+ pkg_failed=yes
+ fi
+@@ -6467,9 +6467,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 "ode" 2>&1`
++ ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ode-double" 2>&1`
+ else
+- ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "ode" 2>&1`
++ ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "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 97a4872..589e04f 100644
--- a/alienarena.spec
+++ b/alienarena.spec
@@ -1,40 +1,39 @@
Name: alienarena
Summary: Multiplayer retro sci-fi deathmatch game
-Version: 7.50
-Release: 1%{?dist}
+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,16 @@ 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
+
* Thu Dec 16 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 7.50-1
- update to 7.50
- fix ode NAN issue
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
More information about the scm-commits
mailing list