rpms/bzflag/devel bzflag-2.0.10-gcc-4.3.patch, 1.2, 1.3 bzflag.spec, 1.43, 1.44
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Fri Feb 22 20:37:59 UTC 2008
Author: nphilipp
Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10256
Modified Files:
bzflag-2.0.10-gcc-4.3.patch bzflag.spec
Log Message:
update gcc-4.3 patch (plugins, #434347)
require libcurl-devel from Fedora 9 onward
bzflag-2.0.10-gcc-4.3.patch:
Index: bzflag-2.0.10-gcc-4.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag-2.0.10-gcc-4.3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzflag-2.0.10-gcc-4.3.patch 22 Feb 2008 16:10:37 -0000 1.2
+++ bzflag-2.0.10-gcc-4.3.patch 22 Feb 2008 20:37:54 -0000 1.3
@@ -1,18 +1,6 @@
-diff -up bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp
---- bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
-+++ bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp 2008-02-22 17:06:00.000000000 +0100
-@@ -5,6 +5,8 @@
-
- #include "bzfsAPI.h"
- #include <map>
-+#include <cstdlib>
-+#include <cstring>
- #include <stdarg.h>
-
- BZ_GET_PLUGIN_VERSION
diff -up bzflag-2.0.10/include/common.h.gcc-4.3 bzflag-2.0.10/include/common.h
--- bzflag-2.0.10/include/common.h.gcc-4.3 2007-11-15 23:11:33.000000000 +0100
-+++ bzflag-2.0.10/include/common.h 2008-02-22 16:51:46.000000000 +0100
++++ bzflag-2.0.10/include/common.h 2008-02-22 17:51:08.000000000 +0100
@@ -33,9 +33,12 @@
#include <stdio.h>
@@ -27,3 +15,150 @@
#endif
+diff -up bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 bzflag-2.0.10/plugins/logDetail/logDetail.cpp
+--- bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100
++++ bzflag-2.0.10/plugins/logDetail/logDetail.cpp 2008-02-22 18:11:32.000000000 +0100
+@@ -13,6 +13,7 @@
+ // logDetail.cpp : Plugin module for logging server events to stdout
+ //
+
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include "bzfsAPI.h"
+diff -up bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp
+--- bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp 2008-02-22 20:55:32.000000000 +0100
+@@ -4,7 +4,8 @@
+ #include <string>
+ #include <vector>
+ #include <map>
+-#include <math.h>
++#include <cstdlib>
++#include <cmath>
+
+ BZ_GET_PLUGIN_VERSION
+
+diff -up bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp
+--- bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100
++++ bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp 2008-02-22 20:57:02.000000000 +0100
+@@ -1,6 +1,7 @@
+ // teamflagreset.cpp : Defines the entry point for the DLL application.
+
+ #include "bzfsAPI.h"
++#include <cstring>
+
+ BZ_GET_PLUGIN_VERSION
+
+diff -up bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp
+--- bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp 2008-02-22 17:51:08.000000000 +0100
+@@ -5,6 +5,8 @@
+
+ #include "bzfsAPI.h"
+ #include <map>
++#include <cstdlib>
++#include <cstring>
+ #include <stdarg.h>
+
+ BZ_GET_PLUGIN_VERSION
+diff -up bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 bzflag-2.0.10/plugins/keepaway/keepaway.cpp
+--- bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100
++++ bzflag-2.0.10/plugins/keepaway/keepaway.cpp 2008-02-22 18:09:18.000000000 +0100
+@@ -1,6 +1,7 @@
+ // keepaway.cpp : Defines the entry point for the DLL application.
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <map>
+diff -up bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp
+--- bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100
++++ bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp 2008-02-22 20:59:59.000000000 +0100
+@@ -2,6 +2,7 @@
+ //
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+
+ BZ_GET_PLUGIN_VERSION
+
+diff -up bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 bzflag-2.0.10/plugins/timedctf/timedctf.cpp
+--- bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 2008-02-22 20:58:31.000000000 +0100
++++ bzflag-2.0.10/plugins/timedctf/timedctf.cpp 2008-02-22 20:58:05.000000000 +0100
+@@ -1,6 +1,7 @@
+ // timedctf.cpp : Defines the entry point for the DLL application.
+
+ #include "bzfsAPI.h"
++#include <cstring>
+
+ BZ_GET_PLUGIN_VERSION
+
+diff -up bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 bzflag-2.0.10/plugins/wwzones/wwzones.cpp
+--- bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/wwzones/wwzones.cpp 2008-02-22 21:01:47.000000000 +0100
+@@ -1,6 +1,7 @@
+ // wwzones.cpp : Defines the entry point for the DLL application.
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <map>
+diff -up bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 bzflag-2.0.10/plugins/airspawn/airspawn.cpp
+--- bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/airspawn/airspawn.cpp 2008-02-22 18:07:27.000000000 +0100
+@@ -3,6 +3,7 @@
+
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+ #include <string>
+ #include <map>
+
+diff -up bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 bzflag-2.0.10/plugins/nagware/nagware.cpp
+--- bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/nagware/nagware.cpp 2008-02-22 18:12:17.000000000 +0100
+@@ -3,6 +3,8 @@
+ // $Id$
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
++#include <cstring>
+ #include <vector>
+
+ BZ_GET_PLUGIN_VERSION
+diff -up bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 bzflag-2.0.10/plugins/flagStay/flagStay.cpp
+--- bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100
++++ bzflag-2.0.10/plugins/flagStay/flagStay.cpp 2008-02-22 18:08:30.000000000 +0100
+@@ -2,6 +2,7 @@
+ //
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <map>
+diff -up bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 bzflag-2.0.10/plugins/koth/koth.cpp
+--- bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100
++++ bzflag-2.0.10/plugins/koth/koth.cpp 2008-02-22 18:10:10.000000000 +0100
+@@ -1,6 +1,7 @@
+ // koth.cpp : Defines the entry point for the DLL application.
+
+ #include "bzfsAPI.h"
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <map>
+diff -up bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 bzflag-2.0.10/plugins/torBlock/torBlock.cpp
+--- bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 2008-02-22 21:01:08.000000000 +0100
++++ bzflag-2.0.10/plugins/torBlock/torBlock.cpp 2008-02-22 21:00:52.000000000 +0100
+@@ -2,6 +2,7 @@
+ //
+
+ #include "bzfsAPI.h"
++#include <cstring>
+ #include <string>
+ #include <algorithm>
+ #include <sstream>
Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- bzflag.spec 22 Feb 2008 16:40:50 -0000 1.43
+++ bzflag.spec 22 Feb 2008 20:37:55 -0000 1.44
@@ -16,6 +16,12 @@
%define _opengl_wrapper 0
%endif
+%if %{?fedora}%{!?fedora:9} >= 9
+%define _libcurl_devel 1
+%else
+%define _libcurl_devel 0
+%endif
+
%define desktop_vendor fedora
#define date 20050930
@@ -48,7 +54,11 @@
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
BuildRequires: ncurses-devel
+%if %_libcurl_devel
+BuildRequires: libcurl-devel
+%else
BuildRequires: curl-devel
+%endif
BuildRequires: c-ares-devel
# for curl version checking in configure. ugh.
BuildRequires: bc
@@ -128,7 +138,8 @@
%changelog
* Fri Feb 22 2008 Nils Philippsen <nphilipp at redhat.com> 2.0.10-6
-- update gcc-4.3 patch: plugins/HoldTheFlag/HoldTheFlag.cpp
+- update gcc-4.3 patch (plugins, #434347)
+- require libcurl-devel from Fedora 9 onward
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.10-5
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list