[gdl/el6: 17/17] Update to 0.9.2 - merge from f16

[Orion Poplawski]

commit 3e2f98e65598c7646e01389d1b170bc1cb634a8f
Merge: 707ecff 819cf00
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Nov 14 10:56:20 2011 -0700

    Update to 0.9.2 - merge from f16

 .gitignore                                         |    1 +
 gdl-0.9rc3-antlr.patch                             |   65 --------------------
 ...0.9rc4-antlr-auto.patch => gdl-antlr-auto.patch |   22 +++---
 gdl-shared.patch                                   |   11 +++
 gdl.spec                                           |   37 +++++++++--
 sources                                            |    2 +-
 6 files changed, 54 insertions(+), 84 deletions(-)
---
diff --cc .gitignore
index 716e363,52c9906..46a2ee0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -gdl-0.9rc4.tar.gz
  /gdl-0.9.tar.gz
  /gdl-0.9.1.tar.gz
+ /gdl-0.9.2.tar.gz
diff --cc gdl.spec
index 9db3ee8,3af3238..49406fa
--- a/gdl.spec
+++ b/gdl.spec
@@@ -14,12 -14,13 +14,13 @@@ Source2:        gdl.s
  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
- Patch4:         gdl-0.9rc3-antlr.patch
- Patch5:         gdl-0.9rc4-antlr-auto.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
 -%if 0%{?fedora}
 +#RHEL5 doesn't have the needed antlr version/headers, has old plplot
 +%if 0%{?fedora} || 0%{?rhel} >= 6
   %if 0%{?fedora} >= 14
  BuildRequires:  antlr-C++
   %else
@@@ -80,11 -79,11 +81,11 @@@ Provides:       %{name}-runtime = %{ver
  
  %prep
  %setup -q -n %{name}-%{version}
 -%if !0%{?rhel}
 +%if 0%{?fedora} || 0%{?rhel} >= 6
- #patch4 -p1 -b .antlr
- %patch5 -p1 -b .antlr-auto
+ %patch1 -p1 -b .antlr-auto
  %endif
+ %patch2 -p1 -b .shared
 -%if !0%{?rhel}
 +%if 0%{?fedora} || 0%{?rhel} >= 6
  rm -rf src/antlr
  %endif
  rm ltmain.sh
@@@ -121,8 -119,7 +123,8 @@@ make %{?_smp_mflags
  popd
  #Build the python module
  pushd build-python
 -%configure %{configure_opts} --enable-python_module --with-hdf=no
 +ln -s ../configure .
- %configure --srcdir=.. %{configure_opts} --enable-python_module
++%configure --srcdir=.. %{configure_opts} --enable-python_module --with-hdf=no
  make %{?_smp_mflags}
  popd