rpms/astromenace/devel astromenace-system-glext.patch, NONE, 1.1 astromenace.spec, 1.10, 1.11

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	astromenace.spec 
Added Files:
	astromenace-system-glext.patch 
Log Message:
* Tue Aug 18 2009 Hans de Goede <hdegoede at redhat.com> - 1.2-13
- Switch to openal-soft


astromenace-system-glext.patch:
 Base.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE astromenace-system-glext.patch ---
diff -up AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h~ AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h
--- AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h~	2007-09-03 12:42:03.000000000 +0200
+++ AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h	2009-08-18 09:22:10.000000000 +0200
@@ -50,13 +50,15 @@
 	#include <GL/gl.h>	// Header File For The OpenGL32 Library
 	#include <GL/glu.h>	// Header File For The GLu32 Library
 	#undef __glext_h_
+	/* We want / need the OpenGL 1.3 function pointer typedefs */
+	#undef GL_VERSION_1_3
+	#include <GL/glext.h>
 #endif
 
 #include <stdlib.h> // rand, ...
 #include <math.h> // math for core Math
 
 
-#include "RendererInterface/GLext.h"
 #include "SDL/SDL.h"
 #include "SDL/SDL_thread.h"
 #include "SDL/SDL_syswm.h"


Index: astromenace.spec
===================================================================
RCS file: /cvs/extras/rpms/astromenace/devel/astromenace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- astromenace.spec	24 Jul 2009 17:24:55 -0000	1.10
+++ astromenace.spec	18 Aug 2009 09:04:22 -0000	1.11
@@ -1,21 +1,28 @@
 Name: astromenace
 Version:  1.2
-Release:  12%{?dist}
+Release:  13%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
 License: GPLv3
 URL: http://www.viewizard.com/
-Source0: http://www.viewizard.com/download/AstroMenaceSourceCode_080519.zip
+# This is http://www.viewizard.com/download/AstroMenaceSourceCode_080519.zip
+# With the non Free (SGI Free Software License B) licensed:
+# AstroMenaceSource/Core/RendererInterface/GLext.h
+# file removed, instead we use the freely licensed system version
+Source0: AstroMenaceSourceCode_080519-clean.tar.xz
 Source1: astromenace.desktop
 Source2: astromenace.png
 Patch0: astromenace-langvfs.patch
 Patch1: astromenace-640x480.patch
 Patch2: astromenace-programmdir.patch
+# Use system glext.h and work around bug 517959
+Patch3: astromenace-system-glext.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: cmake, SDL-devel, openal-devel, freealut-devel, libogg-devel
+BuildRequires: cmake, SDL-devel, libogg-devel
 BuildRequires: libvorbis-devel, libjpeg-devel, desktop-file-utils
+BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10
 Requires: astromenace-data = %{version}, opengl-games-utils
 
 %description
@@ -40,6 +47,7 @@ chmod -x gpl-3.0.txt
 %patch0 -p0
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %build
 %cmake .
@@ -85,6 +93,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 
 %changelog
+* Tue Aug 18 2009 Hans de Goede <hdegoede at redhat.com> - 1.2-13
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild