From 7d64da0dedb8e4e3cd3b88646441ec9bea5488e0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 10 Sep 2012 12:46:10 -0400
Subject: [PATCH] Switch to upstream's split-out glw release

---
 .gitignore       |  1 +
 mesa-libGLw.spec | 45 +++++++++++++--------------------------------
 sources          |  2 +-
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 893bb23..479b15a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 MesaLib-6.5.1.tar.bz2
+/glw-8.0.0.tar.bz2
diff --git a/mesa-libGLw.spec b/mesa-libGLw.spec
index b122660..c58c58d 100644
--- a/mesa-libGLw.spec
+++ b/mesa-libGLw.spec
@@ -1,17 +1,11 @@
-# Bit of a kludge to get libGLw built independently of Mesa.
-# Joyfully stolen from the mesa-6.5 spec file.
-
 Summary: Xt / Motif OpenGL widgets
 Name: mesa-libGLw
-Version: 6.5.1
-Release: 13%{?dist}
+Version: 8.0.0
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
-Patch0: mesa-6.5-build-config.patch
-Patch1: mesa-6.5.1-libGLw.patch
+Source0: ftp://ftp.freedesktop.org/pub/mesa/glw/glw-%{version}.tar.bz2
 
 BuildRequires: libXt-devel
 BuildRequires: libGL-devel
@@ -22,12 +16,6 @@ BuildRequires: lesstif-devel
 %endif
 
 Provides: libGLw
-# libGLw used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
-Obsoletes: Mesa <= 3.4.2-10
-# libGLw moved to XFree86-libs for RHL 7.3, 8, 9, FC1, RHEL 3
-Obsoletes: XFree86-libs < 4.3.0-127
-# libGLw moved to xorg-x11-libs FC[2-4], RHEL4
-Obsoletes: xorg-x11-libs < 6.8.2-38
 
 %description
 Mesa libGLw runtime library.
@@ -47,32 +35,21 @@ Provides: libGLw-devel
 %description devel
 Mesa libGLw development package.
 
-#-- prep -------------------------------------------------------------
 %prep
-%setup -q -n Mesa-%{version}
+%setup -q -n glw-%{version}
 
-%patch0 -p0 -b .build-config
-%patch1 -p1 -b .motif
-
-# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
-# license and are not free software (but redistributable), so we remove them.
-rm include/GL/uglglutshapes.h
-
-#-- Build ------------------------------------------------------------
 %build
+%configure --disable-static --enable-motif
+make %{?_smp_mflags}
 
-make OPT_FLAGS="$RPM_OPT_FLAGS" LIB_DIR=%{_lib} linux
-
-#-- Install ----------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
-make install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} LIB_DIR=%{_lib}
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
-#-- Clean ------------------------------------------------------------
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#-- Check ------------------------------------------------------------
 %check
 
 %post -p /sbin/ldconfig
@@ -80,19 +57,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc src/glw/README
+%doc README
 %{_libdir}/libGLw.so.1
 %{_libdir}/libGLw.so.1.0.0
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libGLw.so
+%{_libdir}/pkgconfig/glw.pc
 %{_includedir}/GL/GLwDrawA.h
 %{_includedir}/GL/GLwDrawAP.h
 %{_includedir}/GL/GLwMDrawA.h
 %{_includedir}/GL/GLwMDrawAP.h
 
 %changelog
+* Mon Sep 10 2012 Adam Jackson <ajax@redhat.com> 8.0.0-1
+- Switch to upstream's split-out glw release
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.5.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 13856c7..7e9949b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c46f2c6646a270911b791dd8e1c2d977  MesaLib-6.5.1.tar.bz2
+b29b8b5481b8cbc839cb02c324bdabd9  glw-8.0.0.tar.bz2