From 68ba098688b814114fe011196e1c736658a369cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@fedoraproject.org>
Date: Tue, 19 Sep 2006 19:51:19 +0000
Subject: [PATCH] Don't build libGLw and install it.

---
 mesa-6.5.1-build-config.patch | 11 +++--------
 mesa.spec                     |  9 ++++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mesa-6.5.1-build-config.patch b/mesa-6.5.1-build-config.patch
index eb40039..4619158 100644
--- a/mesa-6.5.1-build-config.patch
+++ b/mesa-6.5.1-build-config.patch
@@ -103,18 +103,13 @@
  
 --- Mesa-6.5.1/configs/default.build-config	2006-07-20 12:08:04.000000000 -0400
 +++ Mesa-6.5.1/configs/default	2006-08-25 15:53:24.000000000 -0400
-@@ -55,11 +55,11 @@ ASM_SOURCES = 
- 
- # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
- # order to build the Motif widget too)
--GLW_SOURCES = GLwDrawA.c
-+GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
- 
+@@ -60,6 +60,6 @@
  
  # Directories to build
 -LIB_DIR = lib
+-SRC_DIRS = mesa glu glut/glx glw
 +LIB_DIR ?= lib
- SRC_DIRS = mesa glu glut/glx glw
++SRC_DIRS = mesa glu glut/glx
  GLU_DIRS = sgi
  DRIVER_DIRS = x11 osmesa
 @@ -73,14 +73,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
diff --git a/mesa.spec b/mesa.spec
index e03b12e..a375cba 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -277,11 +277,13 @@ rm -rf $RPM_BUILD_ROOT
 # The mesa build system is broken beyond repair.  The lines below just
 # handpick and manually install the parts we want.
 
-make -C src/glu install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} LIB_DIR=%{_lib}
 install -d $RPM_BUILD_ROOT%{_includedir}/GL
-install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 644 include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+
+install -d $RPM_BUILD_ROOT%{_libdir}
 cp -d -f %{_lib}/lib* $RPM_BUILD_ROOT%{_libdir}
+
+install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
 
@@ -389,7 +391,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Sep 19 2006 Kristian Høgsberg <krh@redhat.com> 6.5.1-1
 - Bump to 6.5.1 final release.
-- Drop libGLw subpackage, it is now in Fedora Extras (#188974).
+- Drop libGLw subpackage, it is now in Fedora Extras (#188974) and
+  tweak mesa-6.5.1-build-config.patch to not build libGLw.
 - Drop mesa-6.5.1-r300-smooth-line.patch, the smooth line fallback can
   now be prevented by enabling disable_lowimpact_fallback in
   /etc/drirc.