[irrlicht/f20] fix incorrect version in Makefile causing rpmverify failures

[Tom Callaway]

commit efc2255f0958931c29c036fb0411d869afbe47e5
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon May 12 14:00:00 2014 -0400

    fix incorrect version in Makefile causing rpmverify failures

 irrlicht-1.8.1-mesa10.patch |   26 ++++++++++++++++++++++++++
 irrlicht.spec               |   11 ++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/irrlicht-1.8.1-mesa10.patch b/irrlicht-1.8.1-mesa10.patch
new file mode 100644
index 0000000..ca8e4a7
--- /dev/null
+++ b/irrlicht-1.8.1-mesa10.patch
@@ -0,0 +1,26 @@
+diff -up irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10	2013-12-13 23:05:43.208343706 -0500
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h	2013-12-13 23:05:43.213343691 -0500
+@@ -59,6 +59,9 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
++        #ifndef PFNGLBLENDEQUATIONPROC 
++         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
++        #endif
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#include <GL/glext.h>
+ 	 typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+diff -up irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10 irrlicht-1.8.1/source/Irrlicht/glxext.h
+--- irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10	2013-12-30 12:18:38.368368241 -0500
++++ irrlicht-1.8.1/source/Irrlicht/glxext.h	2013-12-30 12:18:54.305386790 -0500
+@@ -44,6 +44,9 @@ extern "C" {
+ #ifndef GLAPI
+ #define GLAPI extern
+ #endif
++#ifndef GLXContextID
++#define GLXContextID XID
++#endif
+ 
+ /*************************************************************/
+ 
diff --git a/irrlicht.spec b/irrlicht.spec
index 0eedef6..e97e243 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,6 +1,6 @@
 %global irrxml_version 1.8.1
 %global irrlicht_version 1.8.1
-%global master_release 2
+%global master_release 3
 
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
@@ -23,6 +23,8 @@ Patch2:		irrlicht18-libaesgm.patch
 Patch4:		irrlicht-1.8-irrXML-shared-library.patch
 # Fix issue with definition of LOCALE_DECIMAL_POINTS
 Patch5:		irrlicht-1.8-fix-locale-decimal-points.patch
+# Fix build with Mesa 10
+Patch6:		irrlicht-1.8.1-mesa10.patch
 
 URL:		http://irrlicht.sourceforge.net/
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
@@ -80,6 +82,10 @@ Development headers and libraries for irrXML.
 # %patch3 -p1 -b .fastatof
 %patch4 -p1 -b .irrXML
 %patch5 -p1 -b .fix-locale-decimal-points
+%patch6 -p1 -b .mesa10
+
+# Upstream forgot to increment VERSION_RELEASE to 1 in 1.8.1
+sed -i 's|VERSION_RELEASE = 0|VERSION_RELEASE = 1|g' source/Irrlicht/Makefile
 
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -146,6 +152,9 @@ popd
 %{_libdir}/libIrrXML.so
 
 %changelog
+* Mon May 12 2014 Tom Callaway <spot at fedoraproject.org> - 1.8.1-3
+- fix VERSION_RELEASE to be correct in Makefile, resolving bz 1096792
+
 * Thu Nov 28 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 1.8.1-2
 - Change _IRR_MATERIAL_MAX_TEXTURES_ to 8 (RHBZ #1035757)