rpms/torcs/devel torcs-1.3.0-gcc43.patch, NONE, 1.1 torcs.spec, 1.18, 1.19

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094

Modified Files:
	torcs.spec 
Added Files:
	torcs-1.3.0-gcc43.patch 
Log Message:
Include patch to fix build with gcc 4.3.


torcs-1.3.0-gcc43.patch:

--- NEW FILE torcs-1.3.0-gcc43.patch ---
diff -Naupr torcs-1.3.0.orig/src/drivers/olethros/Trajectory.cpp torcs-1.3.0/src/drivers/olethros/Trajectory.cpp
--- torcs-1.3.0.orig/src/drivers/olethros/Trajectory.cpp	2006-11-05 02:49:55.000000000 +0100
+++ torcs-1.3.0/src/drivers/olethros/Trajectory.cpp	2008-02-24 14:27:56.000000000 +0100
@@ -10,6 +10,8 @@
  ***************************************************************************/
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <cmath>
 #include <cassert>
 #include <list>
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2006-11-05 02:42:22.000000000 +0100
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-02-24 14:19:02.000000000 +0100
@@ -32,7 +32,7 @@
 #include "Transform.h"
 
 #include <algorithm>
-#include <new.h>
+#include <new>
 
 class BBoxCompAxis {
 public:
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2006-11-05 02:42:22.000000000 +0100
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-02-24 14:18:51.000000000 +0100
@@ -32,7 +32,7 @@
 #include "Transform.h"
 #include "BBoxTree.h"
 
-#include <new.h>
+#include <new>
 
 BBoxInternal *free_node;
 
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2006-11-05 02:42:23.000000000 +0100
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-02-24 14:19:11.000000000 +0100
@@ -32,7 +32,7 @@
 #include "Object.h"
 #include "Encounter.h"
 
-#include <new.h>
+#include <new>
 
 void addPair(ObjectPtr object1, ObjectPtr object2);
 void removePair(ObjectPtr object1, ObjectPtr object2);
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2006-11-05 02:42:23.000000000 +0100
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-02-24 14:22:35.000000000 +0100
@@ -33,7 +33,7 @@
 #include "Convex.h" 
 #include "Complex.h" 
 
-#include <new.h>
+#include <new>
 
 Object::Object(DtObjectRef obj, ShapePtr shape) : 
   ref(obj), 


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- torcs.spec	20 Feb 2008 04:43:10 -0000	1.18
+++ torcs.spec	24 Feb 2008 13:38:48 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
 Version: 1.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -11,6 +11,7 @@
 Source3: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
+Patch1: torcs-1.3.0-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 Requires: opengl-games-utils
@@ -41,9 +42,10 @@
 
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .freealutfix
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
+%patch0 -p1 -b .freealutfix
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -64,7 +66,7 @@
 %{__install} -D -p -m 0644 Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Wrapper for the desktop file
-%{__ln_s} opengl-game-wrapper.sh %{buildroot}{_bindir}/%{name}-wrapper
+%{__ln_s} opengl-game-wrapper.sh %{buildroot}%{_bindir}/%{name}-wrapper
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -159,7 +161,10 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-5
+* Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 1.3.0-6
+- Include patch to fix build with gcc 4.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.3.0-4