[Xaw3d] - Update to 1.6.2 - Drop patches applied upstream - Enable multiplane-bitmaps and gray-stipples

[Orion Poplawski]

commit 4f439d361f9651ab38f55b473ac1fe7e2683f36c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Apr 3 15:20:55 2012 -0600

    - Update to 1.6.2
    - Drop patches applied upstream
    - Enable multiplane-bitmaps and gray-stipples

 .gitignore                           |    1 +
 Xaw3d-1.5-box.c.patch                |   27 ---------------
 Xaw3d-1.5E-cast.patch                |   25 --------------
 Xaw3d-1.5E-close-destroy-crash.patch |   30 ----------------
 Xaw3d-1.6.1-compat.patch             |   61 ----------------------------------
 Xaw3d-1.6.1-i18n.patch               |   10 -----
 Xaw3d.spec                           |   24 ++++++-------
 sources                              |    2 +-
 8 files changed, 13 insertions(+), 167 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da5c16f..75d77e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Xaw3d-1.5E.tar.gz
 /libXaw3d-1.6.1.tar.bz2
+/libXaw3d-1.6.2.tar.bz2
diff --git a/Xaw3d.spec b/Xaw3d.spec
index 2d8b1e6..85fd15f 100644
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -1,16 +1,11 @@
 Summary: A version of the MIT Athena widget set for X
 Name: Xaw3d
-Version: 1.6.1
-Release: 2%{?dist}
+Version: 1.6.2
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Source: http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
-Patch1: Xaw3d-1.5E-cast.patch
-Patch3: Xaw3d-1.6.1-i18n.patch
-Patch4: Xaw3d-1.5-box.c.patch
 Patch5: Xaw3d-1.5-debian-fixes.patch
 Patch7: Xaw3d-1.6.1-3Dlabel.patch
-Patch8: Xaw3d-1.5E-close-destroy-crash.patch
-Patch9: Xaw3d-1.6.1-compat.patch
 Patch10: Xaw3d-1.6.1-fontset.patch
 Patch11: Xaw3d-1.6.1-hsbar.patch
 
@@ -63,20 +58,18 @@ package.
 
 %prep
 %setup -q -n libXaw3d-%{version}
-%patch1 -p1
-%patch3 -p1 -b .i18n
-%patch4 -p1
 # This doesn't apply cleanly, but has not been applied
 #%patch5 -p1 -b .debian
 %patch7 -p1 -b .3Dlabel
-%patch8 -p1 -b .close-destroy-crash
-%patch9 -p1 -b .compat
 %patch10 -p1 -b .fontset
 %patch11 -p1 -b .hsbar
 
 
 %build
-%configure --disable-static --enable-arrow-scrollbars
+%configure --disable-static \
+  --enable-arrow-scrollbars \
+  --enable-gray-stipples \
+  --enable-multiplane-bitmaps
 make %{?_smp_mflags}
 
 
@@ -108,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Tue Apr 3 2012 Orion Poplawski <orion at cora.nwra.com> - 1.6.2-1
+- Update to 1.6.2
+- Drop patches applied upstream
+- Enable multiplane-bitmaps and gray-stipples
+
 * Sat Feb 25 2012 Orion Poplawski <orion at cora.nwra.com> - 1.6.1-2
 - Rebase compat patch
 
diff --git a/sources b/sources
index 24464b8..76b6884 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3db4cfe29ee911a519ef254625809f9c  libXaw3d-1.6.1.tar.bz2
+b804b1eeba6008a1c11c767eb69f8b12  libXaw3d-1.6.2.tar.bz2