rpms/bzflag/devel bzflag-2.0.10-gcc-4.3.patch, NONE, 1.1 bzflag.spec, 1.39, 1.40
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Fri Jan 4 15:51:50 UTC 2008
Author: nphilipp
Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342
Modified Files:
bzflag.spec
Added Files:
bzflag-2.0.10-gcc-4.3.patch
Log Message:
fix headers for C++ with gcc-4.3
bzflag-2.0.10-gcc-4.3.patch:
--- NEW FILE bzflag-2.0.10-gcc-4.3.patch ---
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-01-04 16:42:06.000000000 +0100
@@ -33,9 +33,12 @@
#include <stdio.h>
#include <stdlib.h> /* needed for bzfrand */
-#include <math.h>
#ifdef __cplusplus
# include <cmath>
+# include <cstring>
+#else
+# include <math.h>
+# include <string.h>
#endif
Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bzflag.spec 20 Dec 2007 10:25:11 -0000 1.39
+++ bzflag.spec 4 Jan 2008 15:51:09 -0000 1.40
@@ -22,7 +22,7 @@
Summary: 3D multi-player tank battle game
Name: bzflag
Version: 2.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2
Group: Amusements/Games
URL: http://bzflag.org
@@ -30,6 +30,7 @@
Source1: bzflag.desktop
Patch0: bzflag-2.0.4-lookup.patch
Patch1: bzflag-2.0.10-plugins.patch
+Patch2: bzflag-2.0.10-gcc-4.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
%if %_modular_x
BuildRequires: libXi-devel
@@ -72,6 +73,7 @@
%setup -q -n %{name}-%{version}%{?date:.%{date}}
%patch0 -p1 -b .lookup
%patch1 -p1 -b .plugins
+%patch2 -p1 -b .gcc-4.3
%build
autoreconf
@@ -125,6 +127,9 @@
%{_mandir}/man*/*
%changelog
+* Fri Jan 04 2008 Nils Philippsen <nphilipp at redhat.com> 2.0.10-4
+- fix headers for C++ with gcc-4.3
+
* Thu Dec 20 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.10-3
- fix global plugin directory
More information about the fedora-extras-commits
mailing list