[alienarena/f15/master] update to 7.51

Tom Callaway spot at fedoraproject.org
Thu Mar 24 16:41:05 UTC 2011


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

    update to 7.51

 alienarena-7.51-nodata.patch            |   21 +++++++++++
 alienarena-7.51-system-ode-double.patch |   59 +++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 0 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


More information about the scm-commits mailing list