diff --git a/bzflag-2.0.10.tar.bz2 b/bzflag-2.0.10.tar.bz2 deleted file mode 100644 index 6b6c5e8..0000000 --- a/bzflag-2.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9cf6214aee8e1cac2f66e3c6f8c213ef401123ac36dc0c8abeec0d9021c5deb -size 11427143 diff --git a/bzflag-2.0.10_missing-includes.patch b/bzflag-2.0.10_missing-includes.patch deleted file mode 100644 index 6a93f29..0000000 --- a/bzflag-2.0.10_missing-includes.patch +++ /dev/null @@ -1,432 +0,0 @@ ---- src/3D/FontManager.cxx -+++ src/3D/FontManager.cxx -@@ -19,6 +19,7 @@ - // System headers - #include - #include -+#include - - // Global implementation headers - #include "bzfgl.h" ---- src/bzadmin/OptionParser.cxx -+++ src/bzadmin/OptionParser.cxx -@@ -14,6 +14,8 @@ - #pragma warning( 4: 4786) - #endif - -+#include -+ - /* interface header */ - #include "OptionParser.h" - ---- src/bzflag/ComposeDefaultKey.h -+++ src/bzflag/ComposeDefaultKey.h -@@ -17,6 +17,7 @@ - - /* system interface headers */ - #include -+#include - - /* common interface headers */ - #include "BzfEvent.h" ---- src/bzflag/ControlPanel.cxx -+++ src/bzflag/ControlPanel.cxx -@@ -19,6 +19,7 @@ - /* system headers */ - #include - #include -+#include - - /* 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 -+ - /* 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 -+ - /* 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 -+ - /* interface header */ - #include "ServerMenu.h" - ---- src/bzflag/sound.cxx -+++ src/bzflag/sound.cxx -@@ -16,6 +16,7 @@ - // system headers - #include - #include -+#include - - // common headers - #include "BzfMedia.h" ---- src/bzfs/AccessControlList.h -+++ src/bzfs/AccessControlList.h -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - #include "TimeKeeper.h" - #include "Address.h" ---- src/bzfs/Authentication.cxx -+++ src/bzfs/Authentication.cxx -@@ -28,6 +28,7 @@ - #include - #endif - #include -+#include - - #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 -+ - /* interface header */ - #include "CustomBase.h" - ---- src/bzfs/CustomDynamicColor.cxx -+++ src/bzfs/CustomDynamicColor.cxx -@@ -18,6 +18,7 @@ - /* system implementation headers */ - #include - #include -+#include - - /* common implementation headers */ - #include "DynamicColor.h" ---- src/bzfs/CustomGroup.cxx -+++ src/bzfs/CustomGroup.cxx -@@ -16,6 +16,8 @@ - /* system headers */ - #include - #include -+#include -+#include - - /* common headers */ - #include "global.h" // for CtfTeams ---- src/bzfs/CustomMeshTransform.cxx -+++ src/bzfs/CustomMeshTransform.cxx -@@ -17,6 +17,7 @@ - - /* system implementation headers */ - #include -+#include - - /* common implementation headers */ - #include "MeshTransform.h" ---- src/bzfs/CustomPhysicsDriver.cxx -+++ src/bzfs/CustomPhysicsDriver.cxx -@@ -17,6 +17,7 @@ - - /* system implementation headers */ - #include -+#include - - /* common implementation headers */ - #include "PhysicsDriver.h" ---- src/bzfs/CustomTextureMatrix.cxx -+++ src/bzfs/CustomTextureMatrix.cxx -@@ -17,6 +17,7 @@ - - /* system implementation headers */ - #include -+#include - - /* 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 -+ - #include "common.h" - - /* interface header */ ---- src/bzfs/CustomWeapon.cxx -+++ src/bzfs/CustomWeapon.cxx -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - /* local implementation headers */ - #include "WorldWeapons.h" ---- src/bzfs/CustomZone.cxx -+++ src/bzfs/CustomZone.cxx -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - /* local implementation headers */ - //#include "EntryZones.h" ---- src/bzfs/ParseMaterial.cxx -+++ src/bzfs/ParseMaterial.cxx -@@ -16,6 +16,7 @@ - - /* system headers */ - #include -+#include - - /* common implementation headers */ - #include "ParseColor.h" ---- src/bzfs/TeamBases.cxx -+++ src/bzfs/TeamBases.cxx -@@ -14,6 +14,8 @@ - #pragma warning(4:4786) - #endif - -+#include -+ - #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 - #include -+#include - - #include "WorldFileObject.h" - #include "WorldFileLocation.h" ---- src/bzfs/WorldFileObject.cxx -+++ src/bzfs/WorldFileObject.cxx -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - WorldFileObject::WorldFileObject() - { ---- src/bzfs/WorldFileObstacle.cxx -+++ src/bzfs/WorldFileObstacle.cxx -@@ -16,6 +16,7 @@ - - #include "common.h" - #include -+#include - - #include "WorldFileObstacle.h" - ---- src/common/AccessList.cxx -+++ src/common/AccessList.cxx -@@ -18,6 +18,7 @@ - // system headers - #include - #include -+#include - - // common headers - #include "bzfio.h" ---- src/common/Bundle.cxx -+++ src/common/Bundle.cxx -@@ -20,6 +20,7 @@ - // system headers - #include - #include -+#include - - // local implementation headers - #include "StateDatabase.h" ---- src/common/Flag.cxx -+++ src/common/Flag.cxx -@@ -18,6 +18,7 @@ - /* system implementation headers */ - #include - #include -+#include - - /* common implementation headers */ - #include "Team.h" ---- src/common/StateDatabase.cxx -+++ src/common/StateDatabase.cxx -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - // local implementation headers - #include "ErrorHandler.h" ---- src/common/TextChunkManager.cxx -+++ src/common/TextChunkManager.cxx -@@ -14,6 +14,8 @@ - #pragma warning(4: 4786) - #endif - -+#include -+ - /* interface header */ - #include "TextChunkManager.h" - ---- src/common/TextUtils.cxx -+++ src/common/TextUtils.cxx -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - - namespace TextUtils - { ---- src/common/TimeKeeper.cxx -+++ src/common/TimeKeeper.cxx -@@ -34,6 +34,7 @@ - static LONGLONG qpcLastCalibration; - static DWORD timeLastCalibration; - #endif /* !defined(_WIN32) */ -+#include - - /* 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 -+ - // class interface header - - #include "cURLManager.h" ---- src/game/ServerItem.cxx -+++ src/game/ServerItem.cxx -@@ -14,6 +14,7 @@ - - /* system headers */ - #include -+#include - - /* interface header */ - #include "ServerItem.h" ---- src/game/ServerList.cxx -+++ src/game/ServerList.cxx -@@ -21,6 +21,7 @@ - #include - #endif - #include -+#include - - /* common implementation headers */ - #include "version.h" ---- src/game/ServerListCache.cxx -+++ src/game/ServerListCache.cxx -@@ -15,6 +15,7 @@ - - /* system headers */ - #include -+#include - - // invoke persistent rebuilding for build versioning - #include "version.h" ---- src/geometry/TankSceneNode.cxx -+++ src/geometry/TankSceneNode.cxx -@@ -20,6 +20,7 @@ - - // system headers - #include -+#include - - // common implementation headers - #include "StateDatabase.h" ---- src/geometry/WallSceneNode.cxx -+++ src/geometry/WallSceneNode.cxx -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - // 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 -+#include - #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 -- -+#include - - - AresHandler::AresHandler(int _index) ---- src/ogl/OpenGLTexture.cxx -+++ src/ogl/OpenGLTexture.cxx -@@ -14,6 +14,7 @@ - - // system headers - #include -+#include - - // common headers - #include "bzfio.h" ---- src/scene/BSPSceneDatabase.cxx -+++ src/scene/BSPSceneDatabase.cxx -@@ -17,6 +17,7 @@ - #include "common.h" - #include "SceneNode.h" - #include -+#include - #include "BSPSceneDatabase.h" - #include "ViewFrustum.h" - #include "SphereSceneNode.h" ---- src/bzfs/CustomPyramid.cxx -+++ src/bzfs/CustomPyramid.cxx -@@ -17,6 +17,7 @@ - - /* system headers */ - #include -+#include - #include - #include - diff --git a/bzflag-2.0.10svn200804211445.tar.bz2 b/bzflag-2.0.10svn200804211445.tar.bz2 new file mode 100644 index 0000000..5152412 --- /dev/null +++ b/bzflag-2.0.10svn200804211445.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc24578fc410afd469d6e5440e39f71f2d34c86f6b103d2b90c6c9d71e2e39e +size 11130252 diff --git a/bzflag.changes b/bzflag.changes index fb9b781..954aea3 100644 --- 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 diff --git a/bzflag.spec b/bzflag.spec index bc17123..834d300 100644 --- 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. diff --git a/rc.bzflagserver b/rc.bzflagserver index aac6207..b960657 100644 --- 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