- added git patch (copy-pasto bugfix from git)

- added include patch (make headers autonomous by including required X header)
- release 2

diff --git a/Mesa-libGLw.spec b/Mesa-libGLw.spec
index bc868cb922865b72cb1191416e53beac1c28c912..c408cb155ce9a6bb841ffc89f07a88d6182e317d 100644 (file)
--- a/Mesa-libGLw.spec
+++ b/Mesa-libGLw.spec
@@ -7,12 +7,14 @@ Summary:      SGI OpenGL Xt widgets library
 Summary(pl.UTF-8):     Biblioteka SGI widgetów Xt dla OpenGL-a
 Name:          Mesa-libGLw
 Version:       8.0.0
-Release:       1
+Release:       2
 Epoch:         1
 License:       SGI MIT-like
 Group:         X11/Libraries
 Source0:       ftp://ftp.freedesktop.org/pub/mesa/glw/glw-%{version}.tar.bz2
 # Source0-md5: b29b8b5481b8cbc839cb02c324bdabd9
+Patch0:                glw-git.patch
+Patch1:                glw-include.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: OpenGL-devel >= 1.2
 BuildRequires: autoconf >= 2.50
@@ -65,6 +67,8 @@ Statyczna biblioteka SGI libGLw.
 
 %prep
 %setup -q -n glw-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/glw-git.patch b/glw-git.patch
new file mode 100644 (file)
index 0000000..838db1d
--- /dev/null
+++ b/glw-git.patch
@@ -0,0 +1,22 @@
+From c4f7cdfd9d877ac6e476b3063b8248be40a86dee Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 23 Jan 2013 16:58:51 +0000
+Subject: Fix an obvious copypasta bug
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/GLwDrawA.c b/GLwDrawA.c
+index b9ef47b..8ce12fb 100644
+--- a/GLwDrawA.c
++++ b/GLwDrawA.c
+@@ -474,7 +474,7 @@ static void Initialize(GLwDrawingAreaWidget req,GLwDrawingAreaWidget neww,ArgLis
+ 
+   /* fix size */
+   if(req->core.width==0) neww->core.width=100;
+-  if(req->core.height==0) neww->core.width=100;
++  if(req->core.height==0) neww->core.height=100;
+ 
+   /* create the attribute list if needed */
+   neww->glwDrawingArea.myList=FALSE;
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/glw-include.patch b/glw-include.patch
new file mode 100644 (file)
index 0000000..7672cb3
--- /dev/null
+++ b/glw-include.patch
@@ -0,0 +1,10 @@
+--- glw-8.0.0/GLwDrawA.h.orig  2012-05-17 15:55:42.000000000 +0200
++++ glw-8.0.0/GLwDrawA.h       2014-06-13 21:01:18.109779551 +0200
+@@ -40,6 +40,7 @@
+ 
+ #include <GL/glx.h>
+ #include <GL/gl.h>
++#include <X11/Intrinsic.h>
+ 
+ /****************************************************************
+  *