SHA256
1
0
forked from pool/bzflag

Accepting request 116019 from games

- Use system c-ares and glew
- Stop using autoreconf

OBS-URL: https://build.opensuse.org/request/show/116019
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzflag?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2012-05-07 20:43:51 +00:00 committed by Git OBS Bridge
commit 257c8deb1d
3 changed files with 40 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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