[gdl: 1/2] Update to 0.9.2 Drop upstreamed patches Drop hdf support from python module, add patch to force buil

[Orion Poplawski]

commit 6a787ba6b48c7ef126ba5f8df24226f2ea29c447
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Nov 11 16:29:21 2011 -0700

    Update to 0.9.2
    Drop upstreamed patches
    Drop hdf support from python module, add patch to force building of python
    shared library

 .gitignore                  |    1 +
 gdl-0.9rc3-antlr.patch      |   65 -----------------------------
 gdl-0.9rc4-antlr-auto.patch |   40 ------------------
 gdl-setopt.patch            |   87 ---------------------------------------
 gdl-shared.patch            |   11 +++++
 gdl-string.patch            |   51 -----------------------
 gdl-strsplit.patch          |   94 -------------------------------------------
 gdl.spec                    |   31 +++++++-------
 sources                     |    2 +-
 9 files changed, 28 insertions(+), 354 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0326331..52c9906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gdl-0.9rc4.tar.gz
 /gdl-0.9.tar.gz
 /gdl-0.9.1.tar.gz
+/gdl-0.9.2.tar.gz
diff --git a/gdl-shared.patch b/gdl-shared.patch
new file mode 100644
index 0000000..d838156
--- /dev/null
+++ b/gdl-shared.patch
@@ -0,0 +1,11 @@
+--- gdl-0.9.2/src/Makefile.am.shared	2011-11-09 12:49:19.552936409 -0700
++++ gdl-0.9.2/src/Makefile.am	2011-11-11 16:09:57.795281527 -0700
+@@ -75,7 +75,7 @@
+ if DARWIN
+ libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
+ else
+-libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
++libgdl_la_LDFLAGS = -rpath $(libdir) $(all_libraries) -Wl,-z,muldefs
+ endif 
+ 
+ libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
diff --git a/gdl.spec b/gdl.spec
index 094f3e8..bfb4800 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gdl
-Version:        0.9.1
-Release:        4%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -14,14 +14,9 @@ Source2:        gdl.sh
 Source3:        makecvstarball
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch0:         gdl-0.9rc3-antlr.patch
-Patch1:         gdl-0.9rc4-antlr-auto.patch
-# Upstream patch to fix strsplit
-Patch2:         gdl-strsplit.patch
-# Use std::string and add a missing #include <string>
-Patch3:         gdl-string.patch
-# Use plplot setopt instead of SetOpt
-Patch4:         gdl-setopt.patch
+Patch1:         gdl-antlr-auto.patch
+# Force build of libgdl.so
+Patch2:         gdl-shared.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #RHEL doesn't have the needed antlr version/headers, has old plplot
@@ -85,12 +80,9 @@ Provides:       %{name}-runtime = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 %if !0%{?rhel}
-#patch0 -p1 -b .antlr
 %patch1 -p1 -b .antlr-auto
 %endif
-%patch2 -p1 -b .strsplit
-%patch3 -p1 -b .string
-%patch4 -p1 -b .setopt
+%patch2 -p1 -b .shared
 %if !0%{?rhel}
 rm -rf src/antlr
 %endif
@@ -104,6 +96,7 @@ autoreconf --install
    --with-fftw \\\
    --with-udunits \\\
    --with-grib \\\
+   --with-pslib=no \\\
    --with-wxWidgets \\\
    %{plplot_config} \\\
    INCLUDES="-I%{_includedir}/udunits2" \\\
@@ -126,7 +119,7 @@ make %{?_smp_mflags}
 popd
 #Build the python module
 pushd build-python
-%configure %{configure_opts} --enable-python_module
+%configure %{configure_opts} --enable-python_module --with-hdf=no
 make %{?_smp_mflags}
 popd
 
@@ -135,7 +128,7 @@ popd
 rm -rf $RPM_BUILD_ROOT
 pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT%{_libdir}
+#rm -r $RPM_BUILD_ROOT%{_libdir}
 popd
 
 # Install the python module
@@ -175,6 +168,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 11 2011 Orion Poplawski <orion at cora.nwra.com> - 0.9.2-1
+- Update to 0.9.2
+- Drop upstreamed patches
+- Drop hdf support from python module, add patch to force building of python
+  shared library
+
 * Thu Aug 18 2011 Orion Poplawski <orion at cora.nwra.com> - 0.9.1-4
 - Rebuild for plplot 5.9.8
 - Add upstream patch to fix strsplit and str_sep
diff --git a/sources b/sources
index 686137e..3cd7ffe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be576675aa1c37f0c1a2b1eb8889a960  gdl-0.9.1.tar.gz
+7178304e6737a8dca910d2c1061ff63c  gdl-0.9.2.tar.gz