OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzflag?expand=0&rev=7

2008-04-21 16:36:30 +00:00 · 2008-04-21 16:36:30 +00:00 · 74e0b0b16e
commit 74e0b0b16e
parent c867b59c1b
6 changed files with 22 additions and 442 deletions
--- a/bzflag-2.0.10.tar.bz2
+++ b/bzflag-2.0.10.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9cf6214aee8e1cac2f66e3c6f8c213ef401123ac36dc0c8abeec0d9021c5deb
-size 11427143
--- a/bzflag-2.0.10_missing-includes.patch
+++ b/bzflag-2.0.10_missing-includes.patch
@ -1,432 +0,0 @@
--- src/3D/FontManager.cxx
-+++ src/3D/FontManager.cxx
-@@ -19,6 +19,7 @@
- // System headers
- #include <math.h>
- #include <string>
-+#include <strings.h>
- 
- // Global implementation headers
- #include "bzfgl.h"
--- src/bzadmin/OptionParser.cxx
-+++ src/bzadmin/OptionParser.cxx
-@@ -14,6 +14,8 @@
- #pragma warning( 4: 4786)
- #endif
- 
-+#include <string.h>
-+
- /* interface header */
- #include "OptionParser.h"
- 
--- src/bzflag/ComposeDefaultKey.h
-+++ src/bzflag/ComposeDefaultKey.h
-@@ -17,6 +17,7 @@
- 
- /* system interface headers */
- #include <deque>
-+#include <string>
- 
- /* common interface headers */
- #include "BzfEvent.h"
--- src/bzflag/ControlPanel.cxx
-+++ src/bzflag/ControlPanel.cxx
-@@ -19,6 +19,7 @@
- /* system headers */
- #include <assert.h>
- #include <time.h>
-+#include <string.h>
- 
- /* common implementation headers */
- #include "BZDBCache.h"
--- src/bzflag/HelpMenu.cxx
-+++ src/bzflag/HelpMenu.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <string.h>
-+
- /* interface header */
- #include "HelpMenu.h"
- 
--- src/bzflag/JoinMenu.cxx
-+++ src/bzflag/JoinMenu.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <string.h>
-+
- /* interface header */
- #include "JoinMenu.h"
- 
--- src/bzflag/ServerMenu.cxx
-+++ src/bzflag/ServerMenu.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <string.h>
-+
- /* interface header */
- #include "ServerMenu.h"
- 
--- src/bzflag/sound.cxx
-+++ src/bzflag/sound.cxx
-@@ -16,6 +16,7 @@
- // system headers
- #include <vector>
- #include <map>
-+#include <string.h>
- 
- // common headers
- #include "BzfMedia.h"
--- src/bzfs/AccessControlList.h
-+++ src/bzfs/AccessControlList.h
-@@ -15,6 +15,7 @@
- 
- #include <vector>
- #include <string>
-+#include <string.h>
- 
- #include "TimeKeeper.h"
- #include "Address.h"
--- src/bzfs/Authentication.cxx
-+++ src/bzfs/Authentication.cxx
-@@ -28,6 +28,7 @@
- #include <unistd.h>
- #endif
- #include <assert.h>
-+#include <string.h>
- 
- #include "DirectoryNames.h"
- 
--- src/bzfs/CustomBase.cxx
-+++ src/bzfs/CustomBase.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <string.h>
-+
- /* interface header */
- #include "CustomBase.h"
- 
--- src/bzfs/CustomDynamicColor.cxx
-+++ src/bzfs/CustomDynamicColor.cxx
-@@ -18,6 +18,7 @@
- /* system implementation headers */
- #include <sstream>
- #include <vector>
-+#include <strings.h>
- 
- /* common implementation headers */
- #include "DynamicColor.h"
--- src/bzfs/CustomGroup.cxx
-+++ src/bzfs/CustomGroup.cxx
-@@ -16,6 +16,8 @@
- /* system headers */
- #include <sstream>
- #include <string>
-+#include <string.h>
-+#include <strings.h>
- 
- /* common headers */
- #include "global.h" // for CtfTeams
--- src/bzfs/CustomMeshTransform.cxx
-+++ src/bzfs/CustomMeshTransform.cxx
-@@ -17,6 +17,7 @@
- 
- /* system implementation headers */
- #include <sstream>
-+#include <strings.h>
- 
- /* common implementation headers */
- #include "MeshTransform.h"
--- src/bzfs/CustomPhysicsDriver.cxx
-+++ src/bzfs/CustomPhysicsDriver.cxx
-@@ -17,6 +17,7 @@
- 
- /* system implementation headers */
- #include <sstream>
-+#include <strings.h>
- 
- /* common implementation headers */
- #include "PhysicsDriver.h"
--- src/bzfs/CustomTextureMatrix.cxx
-+++ src/bzfs/CustomTextureMatrix.cxx
-@@ -17,6 +17,7 @@
- 
- /* system implementation headers */
- #include <math.h>
-+#include <strings.h>
- 
- /* common implementation headers */
- #include "TextureMatrix.h"
--- src/bzfs/CustomWaterLevel.cxx
-+++ src/bzfs/CustomWaterLevel.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <strings.h>
-+
- #include "common.h"
- 
- /* interface header */
--- src/bzfs/CustomWeapon.cxx
-+++ src/bzfs/CustomWeapon.cxx
-@@ -18,6 +18,7 @@
- #include <sstream>
- #include <string>
- #include <math.h>
-+#include <string.h>
- 
- /* local implementation headers */
- #include "WorldWeapons.h"
--- src/bzfs/CustomZone.cxx
-+++ src/bzfs/CustomZone.cxx
-@@ -21,6 +21,7 @@
- #include <string>
- #include <sstream>
- #include <math.h>
-+#include <string.h>
- 
- /* local implementation headers */
- //#include "EntryZones.h"
--- src/bzfs/ParseMaterial.cxx
-+++ src/bzfs/ParseMaterial.cxx
-@@ -16,6 +16,7 @@
- 
- /* system headers */
- #include <sstream>
-+#include <strings.h>
- 
- /* common implementation headers */
- #include "ParseColor.h"
--- src/bzfs/TeamBases.cxx
-+++ src/bzfs/TeamBases.cxx
-@@ -14,6 +14,8 @@
- #pragma warning(4:4786)
- #endif
- 
-+#include <string.h>
-+
- #include "Protocol.h"
- #include "TeamBases.h"
- #include "Pack.h"
--- src/bzfs/WorldFileLocation.cxx
-+++ src/bzfs/WorldFileLocation.cxx
-@@ -17,6 +17,7 @@
- #include "Pack.h"
- #include <math.h>
- #include <sstream>
-+#include <strings.h>
- 
- #include "WorldFileObject.h"
- #include "WorldFileLocation.h"
--- src/bzfs/WorldFileObject.cxx
-+++ src/bzfs/WorldFileObject.cxx
-@@ -23,6 +23,7 @@
- #include <string>
- #include <iostream>
- #include <vector>
-+#include <strings.h>
- 
- WorldFileObject::WorldFileObject()
- {
--- src/bzfs/WorldFileObstacle.cxx
-+++ src/bzfs/WorldFileObstacle.cxx
-@@ -16,6 +16,7 @@
- 
- #include "common.h"
- #include <math.h>
-+#include <strings.h>
- 
- #include "WorldFileObstacle.h"
- 
--- src/common/AccessList.cxx
-+++ src/common/AccessList.cxx
-@@ -18,6 +18,7 @@
- // system headers
- #include <stdio.h>
- #include <ctype.h>
-+#include <strings.h>
- 
- // common headers
- #include "bzfio.h"
--- src/common/Bundle.cxx
-+++ src/common/Bundle.cxx
-@@ -20,6 +20,7 @@
- // system headers
- #include <fstream>
- #include <stdio.h>
-+#include <string.h>
- 
- // local implementation headers
- #include "StateDatabase.h"
--- src/common/Flag.cxx
-+++ src/common/Flag.cxx
-@@ -18,6 +18,7 @@
- /* system implementation headers */
- #include <math.h>
- #include <string>
-+#include <string.h>
- 
- /* common implementation headers */
- #include "Team.h"
--- src/common/StateDatabase.cxx
-+++ src/common/StateDatabase.cxx
-@@ -25,6 +25,7 @@
- #include <iostream>
- #include <math.h>
- #include <string>
-+#include <string.h>
- 
- // local implementation headers
- #include "ErrorHandler.h"
--- src/common/TextChunkManager.cxx
-+++ src/common/TextChunkManager.cxx
-@@ -14,6 +14,8 @@
- #pragma warning(4: 4786)
- #endif
- 
-+#include <string.h>
-+
- /* interface header */
- #include "TextChunkManager.h"
- 
--- src/common/TextUtils.cxx
-+++ src/common/TextUtils.cxx
-@@ -23,6 +23,8 @@
- #include <stdarg.h>
- #include <vector>
- #include <stdio.h>
-+#include <strings.h>
-+#include <string.h>
- 
- namespace TextUtils
- {
--- src/common/TimeKeeper.cxx
-+++ src/common/TimeKeeper.cxx
-@@ -34,6 +34,7 @@
- static LONGLONG	 qpcLastCalibration;
- static DWORD	    timeLastCalibration;
- #endif /* !defined(_WIN32) */
-+#include <string.h>
- 
- /* common implementation headers */
- #include "TextUtils.h"
--- src/common/cURLManager.cxx
-+++ src/common/cURLManager.cxx
-@@ -10,6 +10,8 @@
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
- 
-+#include <string.h>
-+
- // class interface header
- 
- #include "cURLManager.h"
--- src/game/ServerItem.cxx
-+++ src/game/ServerItem.cxx
-@@ -14,6 +14,7 @@
- 
- /* system headers */
- #include <string>
-+#include <string.h>
- 
- /* interface header */
- #include "ServerItem.h"
--- src/game/ServerList.cxx
-+++ src/game/ServerList.cxx
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #endif
- #include <ctype.h>
-+#include <string.h>
- 
- /* common implementation headers */
- #include "version.h"
--- src/game/ServerListCache.cxx
-+++ src/game/ServerListCache.cxx
-@@ -15,6 +15,7 @@
- 
- /* system headers */
- #include <fstream>
-+#include <string.h>
- 
- // invoke persistent rebuilding for build versioning
- #include "version.h"
--- src/geometry/TankSceneNode.cxx
-+++ src/geometry/TankSceneNode.cxx
-@@ -20,6 +20,7 @@
- 
- // system headers
- #include <math.h>
-+#include <string.h>
- 
- // common implementation headers
- #include "StateDatabase.h"
--- src/geometry/WallSceneNode.cxx
-+++ src/geometry/WallSceneNode.cxx
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-+#include <string.h>
- 
- // common implementation headers
- #include "StateDatabase.h"
--- src/mediafile/PNGImageFile.cxx
-+++ src/mediafile/PNGImageFile.cxx
-@@ -13,6 +13,7 @@
- #include "common.h"
- #include "PNGImageFile.h"
- #include <iostream>
-+#include <string.h>
- #include "Pack.h"
- #include "bzfio.h"
- #include "../zlib/zconf.h"
--- src/net/AresHandler.cxx
-+++ src/net/AresHandler.cxx
-@@ -15,7 +15,7 @@
- 
- /* system implementation headers */
- #include <errno.h>
-
-+#include <string.h>
- 
- 
- AresHandler::AresHandler(int _index)
--- src/ogl/OpenGLTexture.cxx
-+++ src/ogl/OpenGLTexture.cxx
-@@ -14,6 +14,7 @@
- 
- // system headers
- #include <string>
-+#include <string.h>
- 
- // common headers
- #include "bzfio.h"
--- src/scene/BSPSceneDatabase.cxx
-+++ src/scene/BSPSceneDatabase.cxx
-@@ -17,6 +17,7 @@
- #include "common.h"
- #include "SceneNode.h"
- #include <assert.h>
-+#include <string.h>
- #include "BSPSceneDatabase.h"
- #include "ViewFrustum.h"
- #include "SphereSceneNode.h"
--- src/bzfs/CustomPyramid.cxx
-+++ src/bzfs/CustomPyramid.cxx
-@@ -17,6 +17,7 @@
- 
- /* system headers */
- #include <math.h>
-+#include <strings.h>
- #include <sstream>
- #include <vector>
- 
--- a/bzflag-2.0.10svn200804211445.tar.bz2
+++ b/bzflag-2.0.10svn200804211445.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cc24578fc410afd469d6e5440e39f71f2d34c86f6b103d2b90c6c9d71e2e39e
+size 11130252
--- a/bzflag.changes
+++ b/bzflag.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 21 15:44:48 CEST 2008 - hvogel@suse.de
+
+- update to latest 2.0 branch svn to fix various c-ares bugs
+  [bnc#378717]
+- add short description to init script
+- build against ncurses for bzadmin
+
 -------------------------------------------------------------------
 Mon Apr  7 02:57:28 CEST 2008 - crrodriguez@suse.de

--- a/bzflag.spec
+++ b/bzflag.spec
@ -1,5 +1,5 @@
 #
-# spec file for package bzflag (Version 2.0.10)
+# spec file for package bzflag (Version 2.0.10svn200804211445)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -12,12 +12,12 @@


 Name:           bzflag
-BuildRequires:  bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel update-desktop-files
+BuildRequires:  bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files
 License:        GPL v2 or later
 Group:          Amusements/Games/3D/Shoot
 AutoReqProv:    on
-Version:        2.0.10
-Release:        27
+Version:        2.0.10svn200804211445
+Release:        1
 Summary:        3D Networked Multiplayer Tank Battle Game
 Url:            http://BZFlag.org/
 Source:         %name-%version.tar.bz2
@ -29,8 +29,7 @@ Source6:        bzflag-icon.png
 Patch:          bzflag-1.10.4-ncursespollution.diff
 Patch1:         bzflag-decl.diff
 Patch3:         bzflag-char-signedness.patch
-Patch5:         %{name}-%{version}_array-subscript2.patch
-Patch6:         %{name}-%{version}_missing-includes.patch
+Patch5:         %{name}-2.0.10_array-subscript2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq

@ -56,7 +55,6 @@ Authors:
 %patch3 -p1
 %patch5
 cp %SOURCE2 .
-%patch6

 %build
 autoreconf -fiv
@ -110,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
 /var/adm/fillup-templates/sysconfig.bzflagserver-bzflag

 %changelog
+* Mon Apr 21 2008 hvogel@suse.de
+- update to latest 2.0 branch svn to fix various c-ares bugs
+  [bnc#378717]
+- add short description to init script
+- build against ncurses for bzadmin
 * Mon Apr 07 2008 crrodriguez@suse.de
 - bzflag no longer uses adns but a bundled copy of libcares,
  update the spec file to use system c-ares instead.
--- a/rc.bzflagserver
+++ b/rc.bzflagserver
@ -20,6 +20,7 @@
 # Required-Stop:  $remote_fs $syslog
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
+# Short-Description: bzflag server daemon
 # Description:    Start bzflagserver to provide a server for the popular
 #	tank game BZFlag, http://www.bzflag.org
 ### END INIT INFO