From 5dc00621b20af018b8853eef681d57d568a40a0d8c8a3f2c578f83c3d36789d4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 6 Apr 2010 14:24:17 +0000 Subject: [PATCH 1/4] Accepting request 37091 from home:hennevogel:branches:games Copy from home:hennevogel:branches:games/bzflag via accept of submit request 37091 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/37091 OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=7 --- bzflag-2.0.10-array-subscript.patch | 17 +++++++++++++++++ bzflag.spec | 6 ++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 bzflag-2.0.10-array-subscript.patch diff --git a/bzflag-2.0.10-array-subscript.patch b/bzflag-2.0.10-array-subscript.patch new file mode 100644 index 0000000..1a2a089 --- /dev/null +++ b/bzflag-2.0.10-array-subscript.patch @@ -0,0 +1,17 @@ +--- src/bzflag/ServerStartMenu.cxx ++++ src/bzflag/ServerStartMenu.cxx +@@ -319,14 +319,6 @@ + + void ServerStartMenu::setSettings(const char* _settings) + { +- // FIXME -- temporary to automatically upgrade old configurations +- if (strlen(_settings) == 14) { +- strcpy(settings, _settings); +- settings[12] = settings[13]; +- settings[13] = settings[14]; +- return; +- } +- + if (strlen(_settings) != strlen(settings)) return; + strcpy(settings, _settings); + } diff --git a/bzflag.spec b/bzflag.spec index 5937498..ed9533d 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -1,5 +1,5 @@ # -# spec file for package bzflag (Version 2.0.16) +# spec file for package bzflag (Version 2.0.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,10 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: bzflag -BuildRequires: bc curl-devel fdupes freeglut-devel gcc-c++ libSDL-devel libcares-devel libdrm-devel ncurses-devel update-desktop-files +BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files fdupes libSDL-devel License: GPLv2+ Group: Amusements/Games/3D/Shoot Version: 2.0.16 From 9e255a3b14db9cc53c788a756af83ec01226c8b32d94b272dc9f4552c6c8ca33 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 6 Apr 2010 21:24:03 +0000 Subject: [PATCH 2/4] Accepting request 37092 from games checked in (request 37092) OBS-URL: https://build.opensuse.org/request/show/37092 OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=8 --- bzflag-2.0.12.tar.bz2 | 3 +++ bzflag-2.0.16.tar.bz2 | 3 --- bzflag.changes | 31 ------------------------------- bzflag.spec | 12 ++++++++---- 4 files changed, 11 insertions(+), 38 deletions(-) create mode 100644 bzflag-2.0.12.tar.bz2 delete mode 100644 bzflag-2.0.16.tar.bz2 diff --git a/bzflag-2.0.12.tar.bz2 b/bzflag-2.0.12.tar.bz2 new file mode 100644 index 0000000..a2aa598 --- /dev/null +++ b/bzflag-2.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6c9edc128e481f73572c4648e919036c6bc484c1a63f9cdd9740118f39d689a +size 11397403 diff --git a/bzflag-2.0.16.tar.bz2 b/bzflag-2.0.16.tar.bz2 deleted file mode 100644 index fbf4334..0000000 --- a/bzflag-2.0.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe6fa0b89e7f950950111b118ee8534cd54917d2c7f9215c1f3215ece38a608f -size 11495082 diff --git a/bzflag.changes b/bzflag.changes index 7efc5ee..d9ba74b 100644 --- a/bzflag.changes +++ b/bzflag.changes @@ -1,34 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 6 13:37:02 UTC 2010 - hvogel@novell.com - -- Update to version 2.0.16 - * Fix regression in protocol handling by server - * Add bullet tails as seen out the viewport - * Remove unused dependency on Xi library - * Allow only one Enter message per player instance - * Add TimeLimit plugin - * Remove broken vocaliser and obsolete torBlock plugins - * Add Options -> Display -> AntiFlicker option - * Add Options -> Input -> Confine Mouse (MotionBox) - * Adjust advanced ground rendering for texture flicker - * Backport fix for /idbanlist and /hostbanlist crashes - * Fix player ghosting failure - * Provide API support for using bz_moveFlag on team flags - * Add pushstats plugin for future statistics gathering system - * Increase restrictions on incompletely joined players - * Announce saved file name in recordmatch plugin - * Fix buffer overflow in menu subsystem - * Fully support glob-style wildcards in hostbans and make name comparisons - case insensitive - * Properly limit maximum message size in /showgroup command - * Reset team scores in case of a capture during a countdown - * Block spoofed /me messages - * Keep flags within the world boundary - * Add the "roamView" BZDB variable - * Change fonts to DejaVu - * Source cleanup - * use fdupes - ------------------------------------------------------------------- Thu Mar 18 12:13:15 UTC 2010 - prusnak@novell.com diff --git a/bzflag.spec b/bzflag.spec index ed9533d..35535fa 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -15,12 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild + + Name: bzflag -BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files fdupes libSDL-devel +BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files License: GPLv2+ Group: Amusements/Games/3D/Shoot -Version: 2.0.16 -Release: 1 +Version: 2.0.12 +Release: 5 Summary: 3D Networked Multiplayer Tank Battle Game Url: http://BZFlag.org/ Source: %{name}-%{version}.tar.bz2 @@ -32,6 +35,7 @@ Source6: %{name}.png Patch: %{name}-1.10.4-ncursespollution.patch Patch1: %{name}-decl.patch Patch3: %{name}-char-signedness.patch +Patch5: %{name}-2.0.10-array-subscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -55,6 +59,7 @@ Authors: %patch -p1 %patch1 %patch3 -p1 +%patch5 cp %SOURCE2 . %build @@ -86,7 +91,6 @@ 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 %suse_update_desktop_file -i %{name} -%fdupes %buildroot %clean rm -rf $RPM_BUILD_ROOT From cdc9423ac181a9d656330bc821ddd11dfe56da4ba7f13fa5105b8efceaf7216e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 5 Jul 2011 00:05:04 +0000 Subject: [PATCH 3/4] Accepting request 75162 from home:jengelh:branches:games - Use %_smp_mflags for parallel building - Strip %clean section (not needed on BS) OBS-URL: https://build.opensuse.org/request/show/75162 OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=9 --- bzflag-2.0.10-array-subscript.patch | 17 ------------- bzflag-2.0.12.tar.bz2 | 3 --- bzflag-2.0.16.tar.bz2 | 3 +++ bzflag.changes | 37 +++++++++++++++++++++++++++++ bzflag.spec | 17 +++++-------- 5 files changed, 46 insertions(+), 31 deletions(-) delete mode 100644 bzflag-2.0.10-array-subscript.patch delete mode 100644 bzflag-2.0.12.tar.bz2 create mode 100644 bzflag-2.0.16.tar.bz2 diff --git a/bzflag-2.0.10-array-subscript.patch b/bzflag-2.0.10-array-subscript.patch deleted file mode 100644 index 1a2a089..0000000 --- a/bzflag-2.0.10-array-subscript.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/bzflag/ServerStartMenu.cxx -+++ src/bzflag/ServerStartMenu.cxx -@@ -319,14 +319,6 @@ - - void ServerStartMenu::setSettings(const char* _settings) - { -- // FIXME -- temporary to automatically upgrade old configurations -- if (strlen(_settings) == 14) { -- strcpy(settings, _settings); -- settings[12] = settings[13]; -- settings[13] = settings[14]; -- return; -- } -- - if (strlen(_settings) != strlen(settings)) return; - strcpy(settings, _settings); - } diff --git a/bzflag-2.0.12.tar.bz2 b/bzflag-2.0.12.tar.bz2 deleted file mode 100644 index a2aa598..0000000 --- a/bzflag-2.0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6c9edc128e481f73572c4648e919036c6bc484c1a63f9cdd9740118f39d689a -size 11397403 diff --git a/bzflag-2.0.16.tar.bz2 b/bzflag-2.0.16.tar.bz2 new file mode 100644 index 0000000..fbf4334 --- /dev/null +++ b/bzflag-2.0.16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe6fa0b89e7f950950111b118ee8534cd54917d2c7f9215c1f3215ece38a608f +size 11495082 diff --git a/bzflag.changes b/bzflag.changes index d9ba74b..c897727 100644 --- a/bzflag.changes +++ b/bzflag.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Sat Jul 2 16:40:20 UTC 2011 - jengelh@medozas.de + +- Use %_smp_mflags for parallel building +- Strip %clean section (not needed on BS) + +------------------------------------------------------------------- +Tue Apr 6 13:37:02 UTC 2010 - hvogel@novell.com + +- Update to version 2.0.16 + * Fix regression in protocol handling by server + * Add bullet tails as seen out the viewport + * Remove unused dependency on Xi library + * Allow only one Enter message per player instance + * Add TimeLimit plugin + * Remove broken vocaliser and obsolete torBlock plugins + * Add Options -> Display -> AntiFlicker option + * Add Options -> Input -> Confine Mouse (MotionBox) + * Adjust advanced ground rendering for texture flicker + * Backport fix for /idbanlist and /hostbanlist crashes + * Fix player ghosting failure + * Provide API support for using bz_moveFlag on team flags + * Add pushstats plugin for future statistics gathering system + * Increase restrictions on incompletely joined players + * Announce saved file name in recordmatch plugin + * Fix buffer overflow in menu subsystem + * Fully support glob-style wildcards in hostbans and make name comparisons + case insensitive + * Properly limit maximum message size in /showgroup command + * Reset team scores in case of a capture during a countdown + * Block spoofed /me messages + * Keep flags within the world boundary + * Add the "roamView" BZDB variable + * Change fonts to DejaVu + * Source cleanup + * use fdupes + ------------------------------------------------------------------- Thu Mar 18 12:13:15 UTC 2010 - prusnak@novell.com diff --git a/bzflag.spec b/bzflag.spec index 35535fa..52a333d 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -1,5 +1,5 @@ # -# spec file for package bzflag (Version 2.0.12) +# spec file for package bzflag (Version 2.0.16) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,15 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: bzflag -BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files +BuildRequires: bc curl-devel fdupes freeglut-devel gcc-c++ libSDL-devel libcares-devel libdrm-devel ncurses-devel update-desktop-files License: GPLv2+ Group: Amusements/Games/3D/Shoot -Version: 2.0.12 -Release: 5 +Version: 2.0.16 +Release: 1 Summary: 3D Networked Multiplayer Tank Battle Game Url: http://BZFlag.org/ Source: %{name}-%{version}.tar.bz2 @@ -35,7 +34,6 @@ Source6: %{name}.png Patch: %{name}-1.10.4-ncursespollution.patch Patch1: %{name}-decl.patch Patch3: %{name}-char-signedness.patch -Patch5: %{name}-2.0.10-array-subscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -59,7 +57,6 @@ Authors: %patch -p1 %patch1 %patch3 -p1 -%patch5 cp %SOURCE2 . %build @@ -68,7 +65,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --with-pic -make %{?jobs:-j %jobs} all +make %{?_smp_mflags} all %preun %stop_on_removal bzflagserver @@ -91,9 +88,7 @@ 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 %suse_update_desktop_file -i %{name} - -%clean -rm -rf $RPM_BUILD_ROOT +%fdupes %buildroot %files %defattr(-, root, root) From 17175a63c7ead0822b941670bf71f3950f4efbad4a0297b4ef718969a660334c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Jul 2011 15:46:14 +0000 Subject: [PATCH 4/4] Accepting request 75524 from home:jmcdough:branches:games Update to 2.4.0 OBS-URL: https://build.opensuse.org/request/show/75524 OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=10 --- bzflag-2.0.16.tar.bz2 | 3 --- bzflag-2.4.0.tar.bz2 | 3 +++ bzflag-decl.patch | 11 ----------- bzflag.changes | 41 +++++++++++++++++++++++++++++++++++++++++ bzflag.spec | 11 +++++++---- 5 files changed, 51 insertions(+), 18 deletions(-) delete mode 100644 bzflag-2.0.16.tar.bz2 create mode 100644 bzflag-2.4.0.tar.bz2 delete mode 100644 bzflag-decl.patch diff --git a/bzflag-2.0.16.tar.bz2 b/bzflag-2.0.16.tar.bz2 deleted file mode 100644 index fbf4334..0000000 --- a/bzflag-2.0.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe6fa0b89e7f950950111b118ee8534cd54917d2c7f9215c1f3215ece38a608f -size 11495082 diff --git a/bzflag-2.4.0.tar.bz2 b/bzflag-2.4.0.tar.bz2 new file mode 100644 index 0000000..2c06dd8 --- /dev/null +++ b/bzflag-2.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:424cec6fe2b23ce88a9975612799c0e3831bbe85f0b1524faadfb93e7c0ad452 +size 15045931 diff --git a/bzflag-decl.patch b/bzflag-decl.patch deleted file mode 100644 index a208ec3..0000000 --- a/bzflag-decl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ogl/OpenGLGState.cxx -+++ src/ogl/OpenGLGState.cxx -@@ -128,6 +128,8 @@ - Unsorted unsorted; - }; - -+class SortedGState; -+ - // - // OpenGLGStateRep - // diff --git a/bzflag.changes b/bzflag.changes index c897727..ff90307 100644 --- a/bzflag.changes +++ b/bzflag.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Jul 6 10:18:23 UTC 2011 - jmcdonough@suse.de + +- Update to version 2.4.0 + * Shot messages are synchronized with position + * Added /playerlist for everyone + * Added message type for properly handling /me actions + * Added BZDB option to hide flags on radar server side + * Removed /setpass /register /identify + * Handicap is computed on the server + * Allow plugins to register custom flag types + * Forced *image.bzflag.org for image downloads until user sets + otherwise + * Accepted patch from McSpider, added OpenFFA + * Removed -requireUDP, now it is always required + * Accepted patch from McSpider, removed client option to turn off fog + * Accepted patch from McSpider, added -noTeamKills option + * Removed -3Dfx, -no3Dfx. Moved -geometry -> -window + * Add ricochet on a per object basis for .bzw files + * serverControl plugin- Add option to ignore observers for server shutdowns + * serverControl plugin- Only report ban file access errors once + * serverControl plugin- Limit filesystem checks to once every 3 seconds + * LogDetail plugin-Add SERVER-MAPNAME with the public server description + * The bzfs -time command line option allows end time + * screenshots now compressed asynchronously + * Add /serverdebug command and plugin API + * Add bzfs -utc command line option to log timestamps using universal time + * Fix buffer overrun when using -ts micros on Linux + * Only players with POLL permission are eligible to vote + * Only allow a single end shot credit for holding the shield flag + * Do not inform hunters of stealthy prey + * All scores are controlled completely by the server + * Relabel player "email" string as "motto" + * Require TALK privilege for player motto to be broadcast + * Always require valid authentication for registered names + * Move flag identification server side + * GM sanity checks + * Added the -publickey requirement for publicly listed servers (and renamed + the bzfs -public option to -publictitle) +- Remove forward declaration patch + ------------------------------------------------------------------- Sat Jul 2 16:40:20 UTC 2011 - jengelh@medozas.de diff --git a/bzflag.spec b/bzflag.spec index 52a333d..ead6ab1 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -21,7 +21,7 @@ Name: bzflag BuildRequires: bc curl-devel fdupes freeglut-devel gcc-c++ libSDL-devel libcares-devel libdrm-devel ncurses-devel update-desktop-files License: GPLv2+ Group: Amusements/Games/3D/Shoot -Version: 2.0.16 +Version: 2.4.0 Release: 1 Summary: 3D Networked Multiplayer Tank Battle Game Url: http://BZFlag.org/ @@ -32,7 +32,6 @@ Source4: sysconfig.bzflagserver-bzflag Source5: %{name}.desktop Source6: %{name}.png Patch: %{name}-1.10.4-ncursespollution.patch -Patch1: %{name}-decl.patch Patch3: %{name}-char-signedness.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -55,7 +54,6 @@ Authors: %prep %setup -q -a 3 %patch -p1 -%patch1 %patch3 -p1 cp %SOURCE2 . @@ -64,6 +62,9 @@ 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 make %{?_smp_mflags} all @@ -93,7 +94,7 @@ install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzflag.png %files %defattr(-, root, root) %doc AUTHORS BUGS COPYING PORTING README DEVINFO README.UNIX -%doc RELNOTES TODO README.Linux misc/bzfs.conf +%doc TODO README.Linux misc/bzfs.conf %{_sysconfdir}/init.d/bzflagserver %{_sbindir}/rcbzflagserver %{_bindir}/* @@ -104,5 +105,7 @@ install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzflag.png %{_mandir}/man5/* %{_mandir}/man6/* %{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/* %changelog