From edc162d54e69f9ab49ed97514641141a8e4a4402400afbe7f8c7367a7ce7c53a Mon Sep 17 00:00:00 2001
From: Cristian Morales Vega <christian.morales.vega@gmail.com>
Date: Mon, 30 Apr 2012 10:54:35 +0000
Subject: [PATCH] - Use system c-ares and glew

OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=16
---
 bzflag-2.4.0-as_needed.patch | 24 ++++++++++++++++++++++++
 bzflag.changes               |  6 ++++++
 bzflag.spec                  | 20 ++++++++++----------
 3 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 bzflag-2.4.0-as_needed.patch

diff --git a/bzflag-2.4.0-as_needed.patch b/bzflag-2.4.0-as_needed.patch
new file mode 100644
index 0000000..6c34015
--- /dev/null
+++ b/bzflag-2.4.0-as_needed.patch
@@ -0,0 +1,24 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -20702,8 +20702,8 @@ ares_works=no
+ if test "x$enable_ares_build" != "xyes" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ares DNS lookup functionality" >&5
+ $as_echo_n "checking for ares DNS lookup functionality... " >&6; }
+-    PRELDFLAGS="$LDFLAGS"
+-    LDFLAGS="$LDFLAGS $LIBCARES"
++    PRELIBS="$LIBS"
++    LIBS="$LIBS $LIBCARES"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -20733,7 +20733,7 @@ else
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-    LDFLAGS="$PRELDFLAGS"
++    LIBS="$PRELIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ares_works" >&5
+ $as_echo "$ares_works" >&6; }
+ fi # enable_ares_build
diff --git a/bzflag.changes b/bzflag.changes
index ddcde8a..1c9c1e4 100644
--- a/bzflag.changes
+++ b/bzflag.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 30 11:53:25 UTC 2012 - reddwarf@opensuse.org
+
+- Use system c-ares and glew
+- Stop using autoreconf
+
 -------------------------------------------------------------------
 Fri Mar 23 00:55:11 UTC 2012 - jengelh@medozas.de
 
diff --git a/bzflag.spec b/bzflag.spec
index 156c351..85bb728 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -14,6 +14,8 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
 Name:           bzflag
 BuildRequires:  bc
 BuildRequires:  curl-devel
@@ -23,9 +25,9 @@ BuildRequires:  gcc-c++
 BuildRequires:  libSDL-devel
 BuildRequires:  libcares-devel
 BuildRequires:  libdrm-devel
-BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(glew)
 Version:        2.4.0
 Release:        0
 Summary:        3D Networked Multiplayer Tank Battle Game
@@ -38,8 +40,9 @@ Source3:        %{name}-maps.tar.bz2
 Source4:        sysconfig.bzflagserver-bzflag
 Source5:        %{name}.desktop
 Source6:        %{name}.png
-Patch:          %{name}-1.10.4-ncursespollution.patch
-Patch3:         %{name}-char-signedness.patch
+Patch0:         %{name}-1.10.4-ncursespollution.patch
+Patch1:         %{name}-char-signedness.patch
+Patch2:         bzflag-2.4.0-as_needed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq
 
@@ -53,19 +56,16 @@ Find server maps in /usr/share/bzflag/maps.
 
 %prep
 %setup -q -a 3
-%patch -p1
-%patch3 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2
 cp %SOURCE2 .
 
 %build
-autoreconf -fiv
-#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-#export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
     --disable-dependency-tracking \
     --libdir=%{_libdir}/%{name} \
-    --disable-static \
-    --with-pic
+    --disable-static
 make %{?_smp_mflags} all
 
 %preun