rpms/CriticalMass/devel CriticalMass-1.0.2-gcc43.patch, NONE, 1.1 CriticalMass.spec, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	CriticalMass.spec 
Added Files:
	CriticalMass-1.0.2-gcc43.patch 
Log Message:
* Fri Jan  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.2-3
- Fix build with gcc 4.3


CriticalMass-1.0.2-gcc43.patch:

--- NEW FILE CriticalMass-1.0.2-gcc43.patch ---
diff -up CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp~ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp
--- CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp~	2008-01-04 23:11:45.000000000 +0100
+++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp	2008-01-04 23:11:45.000000000 +0100
@@ -12,6 +12,8 @@
 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
 //
+#include <stdlib.h>
+
 #include <Trace.hpp>
 #include <zStreamBufferImplZLib.hpp>
 
diff -up CriticalMass-1.0.2/utils/Value.hpp~ CriticalMass-1.0.2/utils/Value.hpp
--- CriticalMass-1.0.2/utils/Value.hpp~	2008-01-04 23:10:42.000000000 +0100
+++ CriticalMass-1.0.2/utils/Value.hpp	2008-01-04 23:10:42.000000000 +0100
@@ -16,6 +16,7 @@
 #define _Value_hpp_
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string>
 
 #include <Trace.hpp>
diff -up CriticalMass-1.0.2/utils/zStream.cpp~ CriticalMass-1.0.2/utils/zStream.cpp
--- CriticalMass-1.0.2/utils/zStream.cpp~	2008-01-04 23:11:15.000000000 +0100
+++ CriticalMass-1.0.2/utils/zStream.cpp	2008-01-04 23:11:15.000000000 +0100
@@ -12,6 +12,8 @@
 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
 //
+#include <stdlib.h>
+
 #include <Trace.hpp>
 #include <Endian.hpp>
 #include <zStream.hpp>
diff -up CriticalMass-1.0.2/utils/ResourceManager.cpp~ CriticalMass-1.0.2/utils/ResourceManager.cpp
--- CriticalMass-1.0.2/utils/ResourceManager.cpp~	2008-01-04 23:10:04.000000000 +0100
+++ CriticalMass-1.0.2/utils/ResourceManager.cpp	2008-01-04 23:10:04.000000000 +0100
@@ -15,6 +15,7 @@
 #include <iomanip>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 
 #include <Trace.hpp>
 #include <ResourceManager.hpp>


Index: CriticalMass.spec
===================================================================
RCS file: /cvs/extras/rpms/CriticalMass/devel/CriticalMass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CriticalMass.spec	17 Dec 2007 20:50:45 -0000	1.2
+++ CriticalMass.spec	4 Jan 2008 22:22:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           CriticalMass
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SDL/OpenGL space shoot'em up game also known as critter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -9,6 +9,7 @@
 Source1:        %{name}.desktop
 Patch0:         CriticalMass-1.0.2-sys-curl.patch
 Patch1:         CriticalMass-1.0.2-sys-tinyxml.patch
+Patch2:         CriticalMass-1.0.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel SDL_mixer-devel libpng-devel curl-devel
 BuildRequires:  tinyxml-devel desktop-file-utils
@@ -28,6 +29,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Fri Jan  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.2-3
+- Fix build with gcc 4.3
+
 * Sat Dec  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.2-2
 - Use system version of tinyxml
 - Some other small specfile cleanups