[vegastrike] * Sat Jul 31 2010 Hans de Goede <hdegoede at redhat.com> 0.5.0-18 - Fix building with gcc-4.5

[Hans de Goede]

commit cb571661980f25dcc8867c752b8ce06ab3b73c10
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Jul 31 16:27:47 2010 +0200

    * Sat Jul 31 2010 Hans de Goede <hdegoede at redhat.com> 0.5.0-18
    - Fix building with gcc-4.5

 vegastrike-0.5.0-gcc45.patch |   12 ++++++++++++
 vegastrike.spec              |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/vegastrike-0.5.0-gcc45.patch b/vegastrike-0.5.0-gcc45.patch
new file mode 100644
index 0000000..f08afd9
--- /dev/null
+++ b/vegastrike-0.5.0-gcc45.patch
@@ -0,0 +1,12 @@
+diff -up vegastrike-source-0.5.0/src/vsfilesystem.h~ vegastrike-source-0.5.0/src/vsfilesystem.h
+--- vegastrike-source-0.5.0/src/vsfilesystem.h~	2008-04-26 04:12:57.000000000 +0200
++++ vegastrike-source-0.5.0/src/vsfilesystem.h	2010-07-31 12:11:39.161652392 +0200
+@@ -294,7 +294,7 @@ namespace VSFileSystem
+ 			VSFile();
+ 			VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly);
+ 			VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly);
+-			VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
++			VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); }
+   			~VSFile();
+ 
+ 			FILE *	GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files)
diff --git a/vegastrike.spec b/vegastrike.spec
index 6a9b2c3..b020f00 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -20,6 +20,7 @@ Patch6:         vegastrike-0.4.3-sys-python.patch
 Patch7:         vegastrike-0.5.0-boost-make_shared.patch
 Patch8:         vegastrike-0.5.0-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
+Patch10:        vegastrike-0.5.0-gcc45.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -47,6 +48,7 @@ Yet danger lurks in the space beyond.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp
 mv README.tmp README
@@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 31 2010 Hans de Goede <hdegoede at redhat.com> 0.5.0-18
+- Fix building with gcc-4.5
+
 * Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 0.5.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild