rpms/scorched3d/devel scorched3d-syslibs.patch, 1.6, 1.7 scorched3d.spec, 1.31, 1.32 scorched3d-41.1-64bit.patch, 1.1, NONE

Hans de Goede jwrdegoede at fedoraproject.org
Mon Sep 8 14:20:40 UTC 2008


Author: jwrdegoede

Update of /cvs/pkgs/rpms/scorched3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073

Modified Files:
	scorched3d-syslibs.patch scorched3d.spec 
Removed Files:
	scorched3d-41.1-64bit.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 41.3-3
- Fix patch fuzz build failure


scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scorched3d-syslibs.patch	6 Nov 2007 21:31:37 -0000	1.6
+++ scorched3d-syslibs.patch	8 Sep 2008 14:20:40 -0000	1.7
@@ -1,6 +1,18 @@
-diff -up scorched/src/XML/XMLParser.h.syslibs scorched/src/XML/XMLParser.h
---- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h	2007-10-31 20:45:00.000000000 +0100
+diff -up scorched/src/GLEXT/GLState.h.foo scorched/src/GLEXT/GLState.h
+--- scorched/src/GLEXT/GLState.h.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/GLEXT/GLState.h	2008-09-08 16:15:53.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+ 
+-#include "glew.h"
++#include <GL/glew.h>
+ 
+ class GLState  
+ {
+diff -up scorched/src/XML/XMLParser.h.foo scorched/src/XML/XMLParser.h
+--- scorched/src/XML/XMLParser.h.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/XML/XMLParser.h	2008-09-08 16:15:53.000000000 +0200
 @@ -21,7 +21,7 @@
  #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
  #define __INCLUDE_XMLParserh_INCLUDE__
@@ -10,21 +22,21 @@
  #include <XML/XMLNode.h>
  
  class XMLParser
-diff -up scorched/src/scorcheds/Makefile.am.syslibs scorched/src/scorcheds/Makefile.am
---- scorched/src/scorcheds/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
-+++ scorched/src/scorcheds/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
+diff -up scorched/src/scorched/Makefile.am.foo scorched/src/scorched/Makefile.am
+--- scorched/src/scorched/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorched/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
  	../common/ProgressCounter.h \
  	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
 -	../common/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -347,29 +346,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
+ 	../common/Vector.cpp \
+ 	../common/Vector.h \
+ 	../common/Vector4.cpp \
+@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
+ 	../net/NetInterface.h \
+ 	../net/UniqueIdStore.cpp \
+ 	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -48,52 +60,46 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -790,5 +774,5 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
+ 	../tankai/TankAINames.cpp \
+ 	../tankai/TankAINames.h \
+ 	../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
+ 	../wxdialogs/SettingsDialog.h
  
- AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
--LDADD = @SDL_LIBS@ @MYSQL_LIBS@
-+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
  
-diff -up scorched/src/scorcheds/Makefile.in.syslibs scorched/src/scorcheds/Makefile.in
---- scorched/src/scorcheds/Makefile.in.syslibs	2007-10-31 11:20:54.000000000 +0100
-+++ scorched/src/scorcheds/Makefile.in	2007-10-31 20:46:32.000000000 +0100
-@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
- 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
- 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
- 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
--	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
-+	RandomGenerator.$(OBJEXT) \
- 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
- 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
-@@ -140,9 +140,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
- 	NetOptions.$(OBJEXT) NetServerTCP.$(OBJEXT) \
- 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
- 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
--	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
--	XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
-+	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
-+	XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
- 	ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
- 	EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
- 	GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
-@@ -511,7 +510,6 @@ scorched3ds_SOURCES = \
+diff -up scorched/src/scorched/Makefile.in.foo scorched/src/scorched/Makefile.in
+--- scorched/src/scorched/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorched/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
+ 	OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
+ 	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
+ 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
+-	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
++	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
+ 	VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
+ 	NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
+ 	UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+-	xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ 	TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
+ 	CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
+ 	DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
+@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
  	../common/ProgressCounter.h \
  	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
 -	../common/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -745,29 +743,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
+ 	../common/Vector.cpp \
+ 	../common/Vector.h \
+ 	../common/Vector4.cpp \
+@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
+ 	../net/NetInterface.h \
+ 	../net/UniqueIdStore.cpp \
+ 	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -117,20 +123,20 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -1188,7 +1171,7 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
+ 	../tankai/TankAINames.cpp \
+ 	../tankai/TankAINames.h \
+ 	../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
+ 	../wxdialogs/SettingsDialog.h
  
- AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
--LDADD = @SDL_LIBS@ @MYSQL_LIBS@
-+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -1639,10 +1622,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
+@@ -466,10 +449,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
@@ -140,7 +146,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1658,62 +1637,6 @@ distclean-compile:
+@@ -485,62 +464,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -203,19 +209,19 @@
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/scorched/Makefile.am.syslibs scorched/src/scorched/Makefile.am
---- scorched/src/scorched/Makefile.am.syslibs	2007-10-14 23:05:52.000000000 +0200
-+++ scorched/src/scorched/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
- 	../common/ProgressCounter.h \
- 	../common/RandomGenerator.cpp \
+diff -up scorched/src/scorchedc/Makefile.am.foo scorched/src/scorchedc/Makefile.am
+--- scorched/src/scorchedc/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorchedc/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
  	../common/RandomGenerator.h \
+ 	../common/sha2.cpp \
+ 	../common/sha2.h \
 -	../common/snprintf.c \
- 	../common/Vector.cpp \
- 	../common/Vector.h \
- 	../common/Vector4.cpp \
-@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
- 	../net/NetInterface.h \
+ 	../common/SplineCurve.cpp \
+ 	../common/SplineCurve.h \
+ 	../common/SplinePath.cpp \
+@@ -374,29 +373,14 @@ scorched3dc_SOURCES = \
+ 	../net/SecureID.h \
  	../net/UniqueIdStore.cpp \
  	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
@@ -241,44 +247,65 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../tankai/TankAINames.cpp \
- 	../tankai/TankAINames.h \
- 	../landscapedef/LandscapeDefinitionsBase.cpp \
-@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
- 	../wxdialogs/SettingsDialog.h
+ 	../engine/Action.cpp \
+ 	../engine/Action.h \
+ 	../engine/ActionController.cpp \
+@@ -792,7 +776,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLConsoleRules.h \
+ 	../GLEXT/GLDynamicVertexArray.cpp \
+ 	../GLEXT/GLDynamicVertexArray.h \
+-	../GLEXT/glew.c \
+ 	../GLEXT/GLFont2d.cpp \
+ 	../GLEXT/GLFont2d.h \
+ 	../GLEXT/GLFrameBufferObject.cpp \
+@@ -1378,5 +1361,5 @@ scorched3dc_SOURCES = \
+ 	../GLSL/GLSLShaderSetup.h
  
- AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
--LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
-+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
  
-diff -up scorched/src/scorched/Makefile.in.syslibs scorched/src/scorched/Makefile.in
---- scorched/src/scorched/Makefile.in.syslibs	2007-10-31 11:20:47.000000000 +0100
-+++ scorched/src/scorched/Makefile.in	2007-10-31 20:45:00.000000000 +0100
-@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
- 	OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
- 	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
- 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
--	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
-+	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
- 	VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
- 	NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
- 	UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
--	xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
-+	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
- 	TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
- 	CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
- 	DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
-@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
- 	../common/ProgressCounter.h \
- 	../common/RandomGenerator.cpp \
+diff -up scorched/src/scorchedc/Makefile.in.foo scorched/src/scorchedc/Makefile.in
+--- scorched/src/scorchedc/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorchedc/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
+ 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
+ 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
+-	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
++	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
+ 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
+ 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
+ 	ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -148,8 +148,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
+ 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
+ 	SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
+-	XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
+-	xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++	XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ 	Action.$(OBJEXT) ActionController.$(OBJEXT) \
+ 	ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
+ 	GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
+@@ -247,7 +246,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	GLConsoleRuleFnIAdapter.$(OBJEXT) \
+ 	GLConsoleRuleMethod.$(OBJEXT) \
+ 	GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
+-	GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
++	GLDynamicVertexArray.$(OBJEXT) \
+ 	GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
+ 	GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
+ 	GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
+@@ -669,7 +668,6 @@ scorched3dc_SOURCES = \
  	../common/RandomGenerator.h \
+ 	../common/sha2.cpp \
+ 	../common/sha2.h \
 -	../common/snprintf.c \
- 	../common/Vector.cpp \
- 	../common/Vector.h \
- 	../common/Vector4.cpp \
-@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
- 	../net/NetInterface.h \
+ 	../common/SplineCurve.cpp \
+ 	../common/SplineCurve.h \
+ 	../common/SplinePath.cpp \
+@@ -920,29 +918,14 @@ scorched3dc_SOURCES = \
+ 	../net/SecureID.h \
  	../net/UniqueIdStore.cpp \
  	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
@@ -304,22 +331,33 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../tankai/TankAINames.cpp \
- 	../tankai/TankAINames.h \
- 	../landscapedef/LandscapeDefinitionsBase.cpp \
-@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
- 	../wxdialogs/SettingsDialog.h
+ 	../engine/Action.cpp \
+ 	../engine/Action.h \
+ 	../engine/ActionController.cpp \
+@@ -1338,7 +1321,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLConsoleRules.h \
+ 	../GLEXT/GLDynamicVertexArray.cpp \
+ 	../GLEXT/GLDynamicVertexArray.h \
+-	../GLEXT/glew.c \
+ 	../GLEXT/GLFont2d.cpp \
+ 	../GLEXT/GLFont2d.h \
+ 	../GLEXT/GLFrameBufferObject.cpp \
+@@ -1924,7 +1906,7 @@ scorched3dc_SOURCES = \
+ 	../GLSL/GLSLShaderSetup.h
  
- AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
--LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
-+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -466,10 +449,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
+@@ -2664,13 +2646,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha2.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
@@ -327,7 +365,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -485,62 +464,6 @@ distclean-compile:
+@@ -2686,76 +2663,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -387,24 +425,38 @@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
 -
+-glew.o: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+-
+-glew.obj: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+-
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/scorchedc/Makefile.am.syslibs scorched/src/scorchedc/Makefile.am
---- scorched/src/scorchedc/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
-+++ scorched/src/scorchedc/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
+diff -up scorched/src/scorcheds/Makefile.am.foo scorched/src/scorcheds/Makefile.am
+--- scorched/src/scorcheds/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorcheds/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
+ 	../common/ProgressCounter.h \
+ 	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
- 	../common/sha2.cpp \
- 	../common/sha2.h \
 -	../common/snprintf.c \
  	../common/SplineCurve.cpp \
  	../common/SplineCurve.h \
  	../common/SplinePath.cpp \
-@@ -358,29 +357,14 @@ scorched3dc_SOURCES = \
- 	../net/SecureID.h \
- 	../net/UniqueIdStore.cpp \
- 	../net/UniqueIdStore.h \
+@@ -363,29 +362,14 @@ scorched3ds_SOURCES = \
+ 	../net/NetServerUDP.h \
+ 	../net/NetServerUDPDestination.cpp \
+ 	../net/NetServerUDPDestination.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -431,64 +483,49 @@
  	../engine/Action.cpp \
  	../engine/Action.h \
  	../engine/ActionController.cpp \
-@@ -776,7 +760,6 @@ scorched3dc_SOURCES = \
- 	../GLEXT/GLConsoleRules.h \
- 	../GLEXT/GLDynamicVertexArray.cpp \
- 	../GLEXT/GLDynamicVertexArray.h \
--	../GLEXT/glew.c \
- 	../GLEXT/GLFont2d.cpp \
- 	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1346,5 +1329,5 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+@@ -806,5 +790,5 @@ scorched3ds_SOURCES = \
+ 	../movement/TargetMovementEntrySpline.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
--LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
-+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
  
-diff -up scorched/src/scorchedc/Makefile.in.syslibs scorched/src/scorchedc/Makefile.in
---- scorched/src/scorchedc/Makefile.in.syslibs	2007-10-31 11:20:51.000000000 +0100
-+++ scorched/src/scorchedc/Makefile.in	2007-10-31 20:47:06.000000000 +0100
-@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+diff -up scorched/src/scorcheds/Makefile.in.foo scorched/src/scorcheds/Makefile.in
+--- scorched/src/scorcheds/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorcheds/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
  	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
  	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
  	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
--	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
-+	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
+-	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
++	RandomGenerator.$(OBJEXT) \
  	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
- 	ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
-@@ -142,8 +142,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+@@ -146,9 +146,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
+ 	NetServerTCP2.$(OBJEXT) NetServerTCP2Destination.$(OBJEXT) \
  	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
  	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
- 	SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
--	XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
--	xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
-+	XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
- 	Action.$(OBJEXT) ActionController.$(OBJEXT) \
- 	ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
- 	GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
-@@ -241,7 +240,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
- 	GLConsoleRuleFnIAdapter.$(OBJEXT) \
- 	GLConsoleRuleMethod.$(OBJEXT) \
- 	GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
--	GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
-+	GLDynamicVertexArray.$(OBJEXT) \
- 	GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
- 	GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
- 	GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
-@@ -656,7 +655,6 @@ scorched3dc_SOURCES = \
+-	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
+-	XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
++	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
++	XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
+ 	ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
+ 	EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
+ 	GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
+@@ -517,7 +516,6 @@ scorched3ds_SOURCES = \
+ 	../common/ProgressCounter.h \
+ 	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
- 	../common/sha2.cpp \
- 	../common/sha2.h \
 -	../common/snprintf.c \
  	../common/SplineCurve.cpp \
  	../common/SplineCurve.h \
  	../common/SplinePath.cpp \
-@@ -891,29 +889,14 @@ scorched3dc_SOURCES = \
- 	../net/SecureID.h \
- 	../net/UniqueIdStore.cpp \
- 	../net/UniqueIdStore.h \
+@@ -767,29 +765,14 @@ scorched3ds_SOURCES = \
+ 	../net/NetServerUDP.h \
+ 	../net/NetServerUDPDestination.cpp \
+ 	../net/NetServerUDPDestination.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -515,30 +552,19 @@
  	../engine/Action.cpp \
  	../engine/Action.h \
  	../engine/ActionController.cpp \
-@@ -1309,7 +1292,6 @@ scorched3dc_SOURCES = \
- 	../GLEXT/GLConsoleRules.h \
- 	../GLEXT/GLDynamicVertexArray.cpp \
- 	../GLEXT/GLDynamicVertexArray.h \
--	../GLEXT/glew.c \
- 	../GLEXT/GLFont2d.cpp \
- 	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1879,7 +1861,7 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+@@ -1210,7 +1193,7 @@ scorched3ds_SOURCES = \
+ 	../movement/TargetMovementEntrySpline.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
--LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
-+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -2603,13 +2585,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
+@@ -1669,10 +1652,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha2.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
@@ -546,7 +572,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -2625,76 +2602,6 @@ distclean-compile:
+@@ -1688,62 +1667,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -606,32 +632,6 @@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
 -
--glew.o: ../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
--
--glew.obj: ../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
--
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/GLEXT/GLState.h.syslibs scorched/src/GLEXT/GLState.h
---- scorched/src/GLEXT/GLState.h.syslibs	2007-10-20 19:54:40.000000000 +0200
-+++ scorched/src/GLEXT/GLState.h	2007-10-31 20:45:00.000000000 +0100
-@@ -24,7 +24,7 @@
- #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
- #undef __MACH__
- 
--#include "glew.h"
-+#include <GL/glew.h>
- 
- class GLState  
- {


Index: scorched3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scorched3d.spec	19 Feb 2008 09:36:37 -0000	1.31
+++ scorched3d.spec	8 Sep 2008 14:20:40 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        41.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 41.3-3
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 41.3-2
 - Autorebuild for GCC 4.3
 


--- scorched3d-41.1-64bit.patch DELETED ---




More information about the fedora-extras-commits mailing list