Accepting request 171287 from games

Update to version 2.4.2 (forwarded request 171280 from worldcitizen) OBS-URL: https://build.opensuse.org/request/show/171287 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzflag?expand=0&rev=25
2013-04-17 21:02:01 +00:00 · 2013-04-17 21:02:01 +00:00 · dca57c7c49
commit dca57c7c49
parent 257c8deb1d 40f6749a04
5 changed files with 60 additions and 60 deletions
--- a/bzflag-2.4.0-as_needed.patch
+++ b/bzflag-2.4.0-as_needed.patch
@ -1,24 +0,0 @@
-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
--- a/bzflag-2.4.0.tar.bz2
+++ b/bzflag-2.4.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:424cec6fe2b23ce88a9975612799c0e3831bbe85f0b1524faadfb93e7c0ad452
-size 15045931
--- a/bzflag-2.4.2.tar.bz2
+++ b/bzflag-2.4.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811
+size 15971448
--- a/bzflag.changes
+++ b/bzflag.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Apr 17 07:49:03 UTC 2013 - joop.boonen@opensuse.org
+
+- Update to version 2.4.2
+  * Added UPnP option to configure server networking - Alfredo Tupone
+  * Added an option to have both leading and lagging radar shot lines - David Anderson
+  * Prevent prohibited solo bots from joining, rather than kick afterward - Scott Wichser, Jeff Makey
+  * Add thiefControl plugin which prevents stealing flags from teammates - Bernt Hansen, Scott Wichser
+  * Preserve shot-limited flag behavior on final shot - David Anderson
+  * Remove the -zoom command line option from bzflag - Jeff Makey
+  * Provide observer team chat in OpenFFA mode - David Anderson
+  * Add fairCTF plugin - Chris Wible
+  * Allow plugins to specify a color when firing world weapons - Chris Wible
+  * Add option for chat on the left and radar on the right - Kyle Mills
+  * Add autoFlagReset plugin - Chris Wible
+  * Allow joystick hats as input on Evdev and SDL platforms - Kyle Mills
+  * Added Fastmap Plugin - Jeffery Myers
+
 -------------------------------------------------------------------
 Mon Apr 30 11:53:25 UTC 2012 - reddwarf@opensuse.org

--- a/bzflag.spec
+++ b/bzflag.spec
@ -1,7 +1,7 @@
 #
 # spec file for package bzflag
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,6 +17,22 @@


 Name:           bzflag
+Version:        2.4.2
+Release:        0
+Summary:        3D Networked Multiplayer Tank Battle Game
+License:        GPL-2.0+
+Group:          Amusements/Games/3D/Shoot
+Url:            http://bzflag.org/
+Source:         http://sourceforge.net/projects/bzflag/files/bzflag%20source/2.4.2/%{name}-%{version}.tar.bz2
+Source2:        rc.bzflagserver
+Source3:        %{name}-maps.tar.bz2
+Source4:        sysconfig.bzflagserver-bzflag
+Source5:        %{name}.desktop
+Source6:        %{name}.png
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch0:         %{name}-1.10.4-ncursespollution.patch
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1:         %{name}-char-signedness.patch
 BuildRequires:  bc
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
@ -27,24 +43,17 @@ BuildRequires:  libcares-devel
 BuildRequires:  libdrm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  update-desktop-files
+%if 0%{?sles_version}
+BuildRequires:  glew-devel
+%else
 BuildRequires:  pkgconfig(glew)
-Version:        2.4.0
-Release:        0
-Summary:        3D Networked Multiplayer Tank Battle Game
-License:        GPL-2.0+
-Group:          Amusements/Games/3D/Shoot
-Url:            http://BZFlag.org/
-Source:         %{name}-%{version}.tar.bz2
-Source2:        rc.bzflagserver
-Source3:        %{name}-maps.tar.bz2
-Source4:        sysconfig.bzflagserver-bzflag
-Source5:        %{name}.desktop
-Source6:        %{name}.png
-Patch0:         %{name}-1.10.4-ncursespollution.patch
-Patch1:         %{name}-char-signedness.patch
-Patch2:         bzflag-2.4.0-as_needed.patch
+%endif
+%if 0%{?suse_version} > 1230
+BuildRequires:  zlib-devel
+%endif
+Requires(pre):  %fillup_prereq
+Requires(pre):  %insserv_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         %insserv_prereq %fillup_prereq

 %description
 BZFlag is a 3D multiplayer tank battle game that allows users to play
@ -58,8 +67,7 @@ Find server maps in /usr/share/bzflag/maps.
 %setup -q -a 3
 %patch0 -p1
 %patch1 -p1
-%patch2
-cp %SOURCE2 .
+cp %{SOURCE2} .

 %build
 %configure \
@ -80,32 +88,30 @@ make %{?_smp_mflags} all

 %install
 #Init script for the BZFlag server
-install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/bzflagserver
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-ln -s %{_sysconfdir}/init.d/bzflagserver $RPM_BUILD_ROOT%{_sbindir}/rcbzflagserver
-make MKDIR_P="mkdir -p --" DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/bzflag/maps
-install -m 644 maps/*bzmap $RPM_BUILD_ROOT%{_datadir}/bzflag/maps
-install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzflag.png
+install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/bzflagserver
+mkdir -p %{buildroot}%{_sbindir}
+ln -s %{_sysconfdir}/init.d/bzflagserver %{buildroot}%{_sbindir}/rcbzflagserver
+make MKDIR_P="mkdir -p --" DESTDIR=%{buildroot} install
+install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
+mkdir -p %{buildroot}%{_datadir}/bzflag/maps
+install -m 644 maps/*bzmap %{buildroot}%{_datadir}/bzflag/maps
+install -D -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/bzflag.png
 %suse_update_desktop_file -i %{name}
-%fdupes %buildroot
+%fdupes %{buildroot}

 %files
 %defattr(-, root, root)
-%doc AUTHORS BUGS COPYING PORTING README DEVINFO README.UNIX
+%doc AUTHORS BUGS COPYING PORTING README DEVINFO
 %doc TODO README.Linux misc/bzfs.conf
 %{_sysconfdir}/init.d/bzflagserver
 %{_sbindir}/rcbzflagserver
 %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man5/*
 %{_mandir}/man6/*
 %{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
+%{_libdir}/%{name}/

 %changelog