Author: blino
Date: Sat Dec 2 15:24:24 2006
New Revision: 90059
Added:
packages/cooker/glest/current/SOURCES/glest-2.0.0-extraqual.patch
Modified:
packages/cooker/glest/current/SPECS/glest.spec
Log:
fix "extra qualification 'class::' on member 'member'" errors
Added: packages/cooker/glest/current/SOURCES/glest-2.0.0-extraqual.patch
==============================================================================
--- (empty file)
+++ packages/cooker/glest/current/SOURCES/glest-2.0.0-extraqual.patch Sat Dec
2 15:24:24 2006
@@ -0,0 +1,11 @@
+--- glest-2.0.0/source/shared_lib/include/graphics/particle.h.extraqual
2005-11-10 18:57:04.000000000 -0500
++++ glest-2.0.0/source/shared_lib/include/graphics/particle.h 2006-12-02
09:01:10.000000000 -0500
+@@ -310,7 +310,7 @@
+ void setTrajectoryFrequency(float trajectoryFrequency)
{this->trajectoryFrequency= trajectoryFrequency;}
+ void setPath(Vec3f startPos, Vec3f endPos);
+
+- static Trajectory ProjectileParticleSystem::strToTrajectory(const
string &str);
++ static Trajectory strToTrajectory(const string &str);
+ };
+
+ // =====================================================
Modified: packages/cooker/glest/current/SPECS/glest.spec
==============================================================================
--- packages/cooker/glest/current/SPECS/glest.spec (original)
+++ packages/cooker/glest/current/SPECS/glest.spec Sat Dec 2 15:24:24 2006
@@ -17,6 +17,7 @@
Source11: %{name}-16x16.png
Source12: %{name}-32x32.png
Source13: %{name}-48x48.png
+Patch0: glest-2.0.0-extraqual.patch
Requires: %{name}-data >= %{version}
BuildRequires: MesaGLU-devel zlib-devel openal-devel xerces-c-devel dos2unix
BuildRequires: SDL-devel oggvorbis-devel XFree86-devel SDL_net-devel
@@ -36,6 +37,8 @@
%prep
%setup -q -a 1 -a 2
+%patch0 -p1 -b .extraqual
+
cd mk/linux
# unfortunately all the files in mk/linux have a dos
# coding and thus a build will fail unless we convert
