rpms/scorched3d/devel .cvsignore, 1.10, 1.11 scorched3d-41.1-gcc43.patch, 1.1, 1.2 scorched3d-help.patch, 1.5, 1.6 scorched3d-syslibs.patch, 1.7, 1.8 scorched3d.spec, 1.34, 1.35 sources, 1.10, 1.11

Hans de Goede jwrdegoede at fedoraproject.org
Sun Feb 22 19:18:39 UTC 2009 

Author: jwrdegoede

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

Modified Files:
	.cvsignore scorched3d-41.1-gcc43.patch scorched3d-help.patch 
	scorched3d-syslibs.patch scorched3d.spec sources 
Log Message:
* Mon Feb 16 2009 Hans de Goede <hdegoede at redhat.com> 42-1
- New upstream release 42



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Dec 2008 15:16:51 -0000	1.10
+++ .cvsignore	22 Feb 2009 19:18:04 -0000	1.11
@@ -1 +1 @@
-Scorched3D-41.3-src-clean.tar.gz
+Scorched3D-42-src-clean.tar.gz

scorched3d-41.1-gcc43.patch:

Index: scorched3d-41.1-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-41.1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-41.1-gcc43.patch	11 Jan 2008 21:28:34 -0000	1.1
+++ scorched3d-41.1-gcc43.patch	22 Feb 2009 19:18:05 -0000	1.2
@@ -1,53 +1,97 @@
-diff -up scorched/src/common/DefinesFile.cpp~ scorched/src/common/DefinesFile.cpp
---- scorched/src/common/DefinesFile.cpp~	2008-01-11 22:13:08.000000000 +0100
-+++ scorched/src/common/DefinesFile.cpp	2008-01-11 22:13:08.000000000 +0100
+diff -up scorched/src/common/common/DefinesFile.cpp.gcc43 scorched/src/common/common/DefinesFile.cpp
+--- scorched/src/common/common/DefinesFile.cpp.gcc43	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/common/DefinesFile.cpp	2009-02-16 15:31:38.000000000 +0100
 @@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <string>
- #include <common/DefinesFile.h>
- #include <sys/types.h>
-diff -up scorched/src/common/main.h~ scorched/src/common/main.h
---- scorched/src/common/main.h~	2008-01-11 22:06:02.000000000 +0100
-+++ scorched/src/common/main.h	2008-01-11 22:06:02.000000000 +0100
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #include <common/DefinesFile.h>
+ #include <sys/types.h>
+diff -up scorched/src/common/common/LoggerI.cpp.gcc43 scorched/src/common/common/LoggerI.cpp
+--- scorched/src/common/common/LoggerI.cpp.gcc43	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/common/LoggerI.cpp	2009-02-16 15:32:29.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <common/LoggerI.h>
+ #include <time.h>
++#include <string.h>
+ 
+ LoggerInfo::LoggerInfo(
+ 	const std::string &message, 
+diff -up scorched/src/common/common/main.h.gcc43 scorched/src/common/common/main.h
+--- scorched/src/common/common/main.h.gcc43	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/common/main.h	2009-02-16 15:32:52.000000000 +0100
 @@ -25,6 +25,7 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
 +#include <stdlib.h>
- 
- static ARGParser aParser;
- char scorched3dAppName[128];
-@@ -40,7 +41,7 @@ int _matherr(struct _exception  *e)
- void _no_storage()
- {
- 	printf("Failed to allocate memory!!");
--	std::exit(1);
-+	exit(1);
- }
- 
- void run_main(int argc, char *argv[], OptionsParameters &params)
-diff -up scorched/src/common/sha2.h~ scorched/src/common/sha2.h
---- scorched/src/common/sha2.h~	2008-01-11 22:15:38.000000000 +0100
-+++ scorched/src/common/sha2.h	2008-01-11 22:15:38.000000000 +0100
+ 
+ static ARGParser aParser;
+ char scorched3dAppName[128];
+@@ -40,7 +41,7 @@ int _matherr(struct _exception  *e)
+ void _no_storage()
+ {
+ 	printf("Failed to allocate memory!!");
+-	std::exit(1);
++	exit(1);
+ }
+ 
+ void run_main(int argc, char *argv[], OptionsParameters &params)
+diff -up scorched/src/common/common/sha2.h.gcc43 scorched/src/common/common/sha2.h
+--- scorched/src/common/common/sha2.h.gcc43	2008-03-02 19:47:36.000000000 +0100
++++ scorched/src/common/common/sha2.h	2009-02-16 15:32:02.000000000 +0100
 @@ -45,6 +45,7 @@
- #define __SHA2C_H__
- 
- #include <string>
-+#include <cstring>
- #include <stdexcept>
- 
- // NOTE: You may need to define things by hand for your system: 
-diff -up scorched/src/common/LoggerI.cpp~ scorched/src/common/LoggerI.cpp
---- scorched/src/common/LoggerI.cpp~	2008-01-11 22:13:48.000000000 +0100
-+++ scorched/src/common/LoggerI.cpp	2008-01-11 22:13:48.000000000 +0100
+ #define __SHA2C_H__
+ 
+ #include <string>
++#include <cstring>
+ #include <stdexcept>
+ 
+ // NOTE: You may need to define things by hand for your system: 
+diff -up scorched/src/client/console/ConsoleImpl.cpp~ scorched/src/client/console/ConsoleImpl.cpp
+--- scorched/src/client/console/ConsoleImpl.cpp~	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/client/console/ConsoleImpl.cpp	2009-02-16 15:52:44.000000000 +0100
+@@ -18,6 +18,7 @@
+ //    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#include <limits.h>
+ #include <console/ConsoleImpl.h>
+ #include <common/Keyboard.h>
+ #include <common/Defines.h>
+diff -up scorched/src/common/landscapemap/HeightMapModifier.cpp~ scorched/src/common/landscapemap/HeightMapModifier.cpp
+--- scorched/src/common/landscapemap/HeightMapModifier.cpp~	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/landscapemap/HeightMapModifier.cpp	2009-02-16 15:41:16.000000000 +0100
 @@ -20,6 +20,7 @@
- 
- #include <common/LoggerI.h>
- #include <time.h>
-+#include <string.h>
- 
- LoggerInfo::LoggerInfo(
- 	const char *message, 
+ 
+ #include <math.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <landscapemap/HeightMapModifier.h>
+ #include <landscapedef/LandscapeDefn.h>
+ #include <common/Defines.h>
+diff -up scorched/src/common/lang/LangParam.cpp~ scorched/src/common/lang/LangParam.cpp
+--- scorched/src/common/lang/LangParam.cpp~	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/lang/LangParam.cpp	2009-02-16 15:35:48.000000000 +0100
+@@ -18,6 +18,7 @@
+ //    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#include <stdlib.h>
+ #include <lang/LangParam.h>
+ #include <common/DefinesString.h>
+ 
+diff -up scorched/src/common/lang/ResourceBundle.h~ scorched/src/common/lang/ResourceBundle.h
+--- scorched/src/common/lang/ResourceBundle.h~	2008-12-29 18:38:23.000000000 +0100
++++ scorched/src/common/lang/ResourceBundle.h	2009-02-16 15:35:14.000000000 +0100
+@@ -22,6 +22,7 @@
+ #define __INCLUDE_ResourceBundle_INCLUDE__
+ 
+ #include <set>
++#include <cstring>
+ #include <lang/ResourceBundleEntry.h>
+ 
+ class ResourceBundle

scorched3d-help.patch:

Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scorched3d-help.patch	6 Nov 2007 21:31:37 -0000	1.5
+++ scorched3d-help.patch	22 Feb 2009 19:18:06 -0000	1.6
@@ -1,14 +1,12 @@
-diff -up scorched/src/common/DefinesScorched.cpp.help scorched/src/common/DefinesScorched.cpp
---- scorched/src/common/DefinesScorched.cpp.help	2007-10-15 21:06:24.000000000 +0200
-+++ scorched/src/common/DefinesScorched.cpp	2007-10-15 21:07:15.000000000 +0200
-@@ -55,8 +55,8 @@ void showURL(const char *url)
- #ifdef __DARWIN__
- 	system(formatString("open %s", url));
- #else
--	system(formatString("firefox %s", url));
--	dialogMessage("Web site location", formatString("%s", url));
-+	system(formatString("htmlview %s&", url));
-+//	dialogMessage("Web site location", formatString("%s", url));
- #endif // __DARWIN__
- #endif // _WIN32
- }
+diff -up scorched/src/common/common/DefinesScorched.cpp.orig scorched/src/common/common/DefinesScorched.cpp
+--- scorched/src/common/common/DefinesScorched.cpp.orig	2009-02-15 15:11:18.000000000 +0100
++++ scorched/src/common/common/DefinesScorched.cpp	2009-02-16 14:28:53.000000000 +0100
+@@ -58,7 +58,7 @@ void S3D::showURL(const std::string &url
+ 	std::string buffer = S3D::formatStringBuffer("open %s", url.c_str());
+ 	system(buffer.c_str());
+ #else
+-	std::string buffer = S3D::formatStringBuffer("firefox %s", url.c_str());
++	std::string buffer = S3D::formatStringBuffer("xdg-open %s", url.c_str());
+ 	system(buffer.c_str());
+ #endif // __DARWIN__
+ #endif // _WIN32

scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scorched3d-syslibs.patch	8 Sep 2008 14:20:40 -0000	1.7
+++ scorched3d-syslibs.patch	22 Feb 2009 19:18:07 -0000	1.8
@@ -1,429 +1,141 @@
-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"
+diff -up scorched/src/client/GLEXT/GLState.h~ scorched/src/client/GLEXT/GLState.h
+--- scorched/src/client/GLEXT/GLState.h~	2009-02-16 14:12:52.000000000 +0100
++++ scorched/src/client/GLEXT/GLState.h	2009-02-16 14:14:27.000000000 +0100
+@@ -22,7 +22,8 @@
+ #define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
+ 
+ #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__
- 
--#include <XML/expat.h>
-+#include <expat.h>
- #include <XML/XMLNode.h>
- 
- class XMLParser
-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/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 \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../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
- 
- 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/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/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 \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../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
- 
- 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:
-@@ -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@
-- 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@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -485,62 +464,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--snprintf.o: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.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 snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
--
--snprintf.obj: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.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 snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
--
--xmlparse.o: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
--
--xmlparse.obj: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
--
--xmlrole.o: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
--
--xmlrole.obj: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
--
--xmltok.o: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.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 xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
--
--xmltok.obj: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.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 xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.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.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/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 \
--	../XML/asciitab.h \
--	../XML/expat.h \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../XML/XMLStringBuffer.h \
--	../XML/xmltok.c \
--	../XML/xmltok.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 \
+ 
+ class GLState  
+ {
+diff -up scorched/src/client/scorchedc/Makefile.am~ scorched/src/client/scorchedc/Makefile.am
+--- scorched/src/client/scorchedc/Makefile.am~	2009-02-15 15:58:33.000000000 +0100
++++ scorched/src/client/scorchedc/Makefile.am	2009-02-16 14:26:20.000000000 +0100
+@@ -78,7 +78,6 @@ scorched3dc_SOURCES = \
+ 	../../common/common/RandomGenerator.h \
+ 	../../common/common/sha2.cpp \
+ 	../../common/common/sha2.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/SplineCurve.cpp \
+ 	../../common/common/SplineCurve.h \
+ 	../../common/common/SplinePath.cpp \
+@@ -897,8 +896,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLCamera.h \
+ 	../GLEXT/GLCameraFrustum.cpp \
+ 	../GLEXT/GLCameraFrustum.h \
 -	../GLEXT/glew.c \
+-	../GLEXT/glew.h \
  	../GLEXT/GLFont2d.cpp \
  	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1378,5 +1361,5 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+ 	../GLEXT/GLFont2dFreeType.cpp \
+@@ -942,8 +939,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLVertexBufferObject.h \
+ 	../GLEXT/GLViewPort.cpp \
+ 	../GLEXT/GLViewPort.h \
+-	../GLEXT/glxew.h \
+-	../GLEXT/wglew.h \
+ 	../GLSL/GLSLProgram.cpp \
+ 	../GLSL/GLSLProgram.h \
+ 	../GLSL/GLSLShader.cpp \
+@@ -1459,5 +1454,5 @@ scorched3dc_SOURCES = \
+ 	../../common/lang/ResourceBundleEntryImpl.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+ AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server  @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
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW
  
-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
+diff -up scorched/src/client/scorchedc/Makefile.in~ scorched/src/client/scorchedc/Makefile.in
+--- scorched/src/client/scorchedc/Makefile.in~	2009-02-15 15:58:39.000000000 +0100
++++ scorched/src/client/scorchedc/Makefile.in	2009-02-16 14:26:22.000000000 +0100
+@@ -64,7 +64,7 @@ am_scorched3dc_OBJECTS = ARGParser.$(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/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 \
--	../XML/asciitab.h \
--	../XML/expat.h \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../XML/XMLStringBuffer.h \
--	../XML/xmltok.c \
--	../XML/xmltok.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 \
+ 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+@@ -269,7 +269,7 @@ am_scorched3dc_OBJECTS = ARGParser.$(OBJ
+ 	SkipDialog.$(OBJEXT) SoundDialog.$(OBJEXT) \
+ 	StartDialog.$(OBJEXT) TipDialog.$(OBJEXT) \
+ 	TutorialDialog.$(OBJEXT) GLCamera.$(OBJEXT) \
+-	GLCameraFrustum.$(OBJEXT) glew.$(OBJEXT) GLFont2d.$(OBJEXT) \
++	GLCameraFrustum.$(OBJEXT) GLFont2d.$(OBJEXT) \
+ 	GLFont2dFreeType.$(OBJEXT) GLFont2dStorage.$(OBJEXT) \
+ 	GLFrameBufferObject.$(OBJEXT) GLGlobalState.$(OBJEXT) \
+ 	GLImageItterator.$(OBJEXT) GLImageModifier.$(OBJEXT) \
+@@ -643,7 +643,6 @@ scorched3dc_SOURCES = \
+ 	../../common/common/RandomGenerator.h \
+ 	../../common/common/sha2.cpp \
+ 	../../common/common/sha2.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/SplineCurve.cpp \
+ 	../../common/common/SplineCurve.h \
+ 	../../common/common/SplinePath.cpp \
+@@ -1462,8 +1461,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLCamera.h \
+ 	../GLEXT/GLCameraFrustum.cpp \
+ 	../GLEXT/GLCameraFrustum.h \
 -	../GLEXT/glew.c \
+-	../GLEXT/glew.h \
  	../GLEXT/GLFont2d.cpp \
  	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1924,7 +1906,7 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+ 	../GLEXT/GLFont2dFreeType.cpp \
+@@ -1507,8 +1504,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLVertexBufferObject.h \
+ 	../GLEXT/GLViewPort.cpp \
+ 	../GLEXT/GLViewPort.h \
+-	../GLEXT/glxew.h \
+-	../GLEXT/wglew.h \
+ 	../GLSL/GLSLProgram.cpp \
+ 	../GLSL/GLSLProgram.h \
+ 	../GLSL/GLSLShader.cpp \
+@@ -2024,7 +2019,7 @@ scorched3dc_SOURCES = \
+ 	../../common/lang/ResourceBundleEntryImpl.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+ AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server  @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
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW
  all: all-am
  
  .SUFFIXES:
-@@ -2664,13 +2646,8 @@ distclean-compile:
+@@ -2783,7 +2778,6 @@ 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)/lapi.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lauxlib.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lbaselib.Po at am__quote@
+@@ -2816,7 +2810,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lzio.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@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -2686,76 +2663,6 @@ distclean-compile:
+@@ -2832,34 +2825,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
--snprintf.o: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+-snprintf.o: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
 - at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
 -
--snprintf.obj: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+-snprintf.obj: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
 - at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.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 snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
--
--xmlparse.o: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
--
--xmlparse.obj: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
--
--xmlrole.o: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
--
--xmlrole.obj: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
--
--xmltok.o: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
--
--xmltok.obj: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.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 xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.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
@@ -442,195 +154,122 @@
  .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/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/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -363,29 +362,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
--	../XML/ascii.h \
--	../XML/asciitab.h \
--	../XML/expat.h \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../XML/XMLStringBuffer.h \
--	../XML/xmltok.c \
--	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -806,5 +790,5 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
+diff -up scorched/src/launcher/scorched/Makefile.am~ scorched/src/launcher/scorched/Makefile.am
+--- scorched/src/launcher/scorched/Makefile.am~	2009-02-15 15:58:33.000000000 +0100
++++ scorched/src/launcher/scorched/Makefile.am	2009-02-16 14:26:24.000000000 +0100
+@@ -73,7 +73,6 @@ scorched3d_SOURCES = \
+ 	../../common/common/ProgressCounter.h \
+ 	../../common/common/RandomGenerator.cpp \
+ 	../../common/common/RandomGenerator.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/Vector.cpp \
+ 	../../common/common/Vector.h \
+ 	../../common/common/Vector4.cpp \
+diff -up scorched/src/launcher/scorched/Makefile.in~ scorched/src/launcher/scorched/Makefile.in
+--- scorched/src/launcher/scorched/Makefile.in~	2009-02-15 15:58:40.000000000 +0100
++++ scorched/src/launcher/scorched/Makefile.in	2009-02-16 14:26:25.000000000 +0100
+@@ -65,7 +65,7 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
+ 	LoggerI.$(OBJEXT) NumberParser.$(OBJEXT) OptionEntry.$(OBJEXT) \
+ 	OptionsGame.$(OBJEXT) OptionsParameters.$(OBJEXT) \
+ 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
+-	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
++	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
+ 	VectorLib.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+ 	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ 	OptionsDisplay.$(OBJEXT) ModDirs.$(OBJEXT) \
+@@ -306,7 +306,6 @@ scorched3d_SOURCES = \
+ 	../../common/common/ProgressCounter.h \
+ 	../../common/common/RandomGenerator.cpp \
+ 	../../common/common/RandomGenerator.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/Vector.cpp \
+ 	../../common/common/Vector.h \
+ 	../../common/common/Vector4.cpp \
+@@ -508,7 +507,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@
  
- AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
--LDADD = @SDL_LIBS@ @MYSQL_LIBS@
-+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -524,20 +522,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
-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
+-snprintf.o: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
+-
+-snprintf.obj: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.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/server/scorcheds/Makefile.am~ scorched/src/server/scorcheds/Makefile.am
+--- scorched/src/server/scorcheds/Makefile.am~	2009-02-15 15:58:33.000000000 +0100
++++ scorched/src/server/scorcheds/Makefile.am	2009-02-16 14:26:27.000000000 +0100
+@@ -77,7 +77,6 @@ scorched3ds_SOURCES = \
+ 	../../common/common/RandomGenerator.h \
+ 	../../common/common/sha2.cpp \
+ 	../../common/common/sha2.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/SplineCurve.cpp \
+ 	../../common/common/SplineCurve.h \
+ 	../../common/common/SplinePath.cpp \
+diff -up scorched/src/server/scorcheds/Makefile.in~ scorched/src/server/scorcheds/Makefile.in
+--- scorched/src/server/scorcheds/Makefile.in~	2009-02-15 15:58:42.000000000 +0100
++++ scorched/src/server/scorcheds/Makefile.in	2009-02-16 14:26:30.000000000 +0100
+@@ -64,7 +64,7 @@ am_scorched3ds_OBJECTS = main.$(OBJEXT) 
  	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
  	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
  	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
--	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
-+	RandomGenerator.$(OBJEXT) \
+-	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
++	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
  	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
  	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) \
--	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/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -767,29 +765,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
--	../XML/ascii.h \
--	../XML/asciitab.h \
--	../XML/expat.h \
--	../XML/expat_config.h \
--	../XML/iasciitab.h \
--	../XML/internal.h \
--	../XML/latin1tab.h \
--	../XML/nametab.h \
--	../XML/utf8tab.h \
--	../XML/winconfig.h \
- 	../XML/XMLFile.cpp \
- 	../XML/XMLFile.h \
- 	../XML/XMLNode.cpp \
- 	../XML/XMLNode.h \
--	../XML/xmlparse.c \
- 	../XML/XMLParser.cpp \
- 	../XML/XMLParser.h \
--	../XML/xmlrole.c \
--	../XML/xmlrole.h \
- 	../XML/XMLStringBuffer.cpp \
- 	../XML/XMLStringBuffer.h \
--	../XML/xmltok.c \
--	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -1210,7 +1193,7 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
- 
- 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:
-@@ -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@
+@@ -502,7 +502,6 @@ scorched3ds_SOURCES = \
+ 	../../common/common/RandomGenerator.h \
+ 	../../common/common/sha2.cpp \
+ 	../../common/common/sha2.h \
+-	../../common/common/snprintf.c \
+ 	../../common/common/SplineCurve.cpp \
+ 	../../common/common/SplineCurve.h \
+ 	../../common/common/SplinePath.cpp \
+@@ -1836,7 +1835,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lzio.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@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1688,62 +1667,6 @@ distclean-compile:
+@@ -1852,20 +1850,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
--snprintf.o: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+-snprintf.o: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
 - at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
 -
--snprintf.obj: ../common/snprintf.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+-snprintf.obj: ../../common/common/snprintf.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
 - at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.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 snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
--
--xmlparse.o: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
--
--xmlparse.obj: ../XML/xmlparse.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.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 xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
--
--xmlrole.o: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
--
--xmlrole.obj: ../XML/xmlrole.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.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 xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
--
--xmltok.o: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.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 xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
--
--xmltok.obj: ../XML/xmltok.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../../common/common/snprintf.c' object='snprintf.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 xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
 -
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- scorched3d.spec	20 Jan 2009 09:52:05 -0000	1.34
+++ scorched3d.spec	22 Feb 2009 19:18:08 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        41.3
-Release:        5%{?dist}
+Version:        42
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -43,23 +43,15 @@
 %prep
 %setup -q -n scorched
 rm `find . -name Makefile`
-rm `find src/XML ! -name "X*"`
 %patch1 -p1 -z .syslibs
 %patch2 -p1 -z .help
 %patch3 -p1 -z .gcc43
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > AUTHORS.tmp
 mv AUTHORS.tmp AUTHORS
-# make rpmlint happy with debuginfo package
-chmod -x src/GLEXT/*
 # stop autoxxx from running
 touch aclocal.m4
 touch configure
 touch `find -name Makefile.in`
-# stop the build from breaking on the removed fonts
-touch data/fonts/test.ttf
-touch data/fonts/vera.ttf
-touch data/fonts/veramobd.ttf
-touch data/fonts/VERA-COPYRIGHT.TXT
 
 
 %build
@@ -75,13 +67,12 @@
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-ln -f -s ../../../fonts/dejavu/DejaVuSans-Oblique.ttf \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/test.ttf
 ln -f -s ../../../fonts/dejavu/DejaVuSans.ttf \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/vera.ttf
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusans.ttf
+ln -f -s ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusconbd.ttf
 ln -f -s ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/veramobd.ttf
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/VERA-COPYRIGHT.TXT
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusmobd.ttf
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -112,7 +103,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO
+%doc AUTHORS COPYING CHANGELOG
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -120,6 +111,9 @@
 
 
 %changelog
+* Mon Feb 16 2009 Hans de Goede <hdegoede at redhat.com> 42-1
+- New upstream release 42
+
 * Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 41.3-5
 - Adjust font requires for font rename (rh 480471)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Dec 2008 15:16:51 -0000	1.10
+++ sources	22 Feb 2009 19:18:08 -0000	1.11
@@ -1 +1 @@
-32ac89b61f4ce5679f84b5dc06a93634  Scorched3D-41.3-src-clean.tar.gz
+3c978ac43bc84b06b866ad23dc4abc25  Scorched3D-42-src-clean.tar.gz

More information about the scm-commits mailing list