[grads/f13/master] - Update to 2.0.a9 - Remove upstreamed patches

[Deji Akingunola]

commit b9f69d06acaa8ef18d8c62852735847a6b6ef9a2
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Fri Sep 3 13:42:37 2010 -0400

    - Update to 2.0.a9
    - Remove upstreamed patches

 geotiff.m4                   |  169 ------------------------------------------
 grads-find-geotiff.patch     |   27 -------
 grads-find-system-libs.patch |   22 ++++++
 grads.spec                   |   46 ++++++------
 sources                      |    2 +-
 5 files changed, 47 insertions(+), 219 deletions(-)
---
diff --git a/grads-find-system-libs.patch b/grads-find-system-libs.patch
new file mode 100644
index 0000000..f301b66
--- /dev/null
+++ b/grads-find-system-libs.patch
@@ -0,0 +1,22 @@
+--- configure.ac	2010-08-30 13:21:31.000000000 -0400
++++ configure.ac.new	2010-09-03 10:34:44.860929508 -0400
+@@ -429,7 +429,18 @@
+     ])    
+     GA_UNSET_FLAGS
+   fi
+-  # here's where we could add a macro to look outside supplibs for shapelib
++  # look outside supplibs for shapelib
++  if test "$use_shp" != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
++    echo
++    echo "Checking in system locations for libraries to support shapefiles ..."
++    AC_CHECK_HEADERS([shapefil.h], 
++    [ AC_CHECK_LIB([shp], [main],
++      [ use_shp=yes 
++        shp_inc=""
++        shp_libs="-lshp"
++      ])
++    ])
++  fi
+ fi
+ if test "$use_shp" != "yes" ; then
+   AC_DEFINE(USESHP, 0, [Enable shapefile])
diff --git a/grads.spec b/grads.spec
index 34f8574..7e65f2e 100644
--- a/grads.spec
+++ b/grads.spec
@@ -1,6 +1,6 @@
 Name:           grads
-Version:        2.0.a7.1
-Release:        0.3%{?dist}
+Version:        2.0.a9
+Release:        0.1%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -8,26 +8,22 @@ Group:          Applications/Engineering
 License:        GPLv2 and MIT
 URL:            http://grads.iges.org/grads/grads.html
 
-# original tarball contains non free code
-#Source0:        ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
-Source0:        grads-%{version}-src.tar.gz
+Source0:        ftp://iges.org/grads/2.0/grads-%{version}-src.tar.gz
 
 # Copyrights explanation
-Source2:        grads-copyright_summary
+Source1:        grads-copyright_summary
 # README telling to turn BackingStore true
-Source3:        grads-README.xorg
-Source4:        geotiff.m4
-Patch0:		grads-find-geotiff.patch
+Source2:        grads-README.xorg
+
+Patch0:		grads-find-system-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-static hdf-devel
-BuildRequires:  g2clib-static g2clib-devel
-BuildRequires:  udunits-devel netcdf-devel 
-BuildRequires:  readline-devel
-BuildRequires:  libnc-dap-devel
-BuildRequires:  zlib-devel libjpeg-devel gd-devel libgeotiff-devel
-BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  hdf-static hdf-devel hdf5-devel netcdf-devel
+BuildRequires:  g2clib-static g2clib-devel udunits-devel
+BuildRequires:  readline-devel ncurses-devel
+BuildRequires:  shapelib-devel gd-devel libgeotiff-devel libnc-dap-devel
+BuildRequires:  zlib-devel libjpeg-devel libpng-devel
 BuildRequires:  libXmu-devel libX11-devel libsx-devel
 BuildRequires:  pkgconfig
 BuildRequires:  automake
@@ -45,18 +41,21 @@ commonly used operating systems and is freely distributed over the Internet.
 
 %prep
 %setup -q
-%patch0 -p0 -b .geotiff
+%patch0 -p0 -b .sys
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gxsubs.c
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} .
 # README for use with xorg
-cp -p %{SOURCE3} README.xorg
-cp -p %{SOURCE4} m4/
+cp -p %{SOURCE2} README.xorg
 autoreconf -f -i
 
 %build
 #./bootstrap
-%configure --enable-dyn-supplibs --without-gui --with-geotiff LDFLAGS="-L%{_libdir}/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/ -I%{_includedir}/netcdf/ -I%{_includedir}/hdf/"
+%configure --enable-dyn-supplibs				\
+	--without-gui --with-geotiff --with-sdf	--with-shp	\
+	--with-netcdf-include=%{_includedir} --with-netcdf-libdir=%{_libdir}\
+	LDFLAGS="-L%{_libdir}/hdf/"	\
+	CPPFLAGS="-I%{_includedir}/hdf -I%{_includedir}/libshp"
 
 make %{?_smp_mflags}
 
@@ -81,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYRIGHT __dist_docs/html README.xorg grads-copyright_summary
 %{_bindir}/bufrscan
 %{_bindir}/grads
-%{_bindir}/gradsdap
 %{_bindir}/gribmap
 %{_bindir}/grib2scan
 %{_bindir}/gribscan
@@ -95,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 03 2010 Deji Akingunola <dakingun at gmail.com> - 2.0.a9-0.1
+- Update to 2.0.a9
+- Remove upstreamed patches
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.3
 - Same as below with hdf-static.
 - Explicitly BR g2clib-static in accordance with the Packaging
diff --git a/sources b/sources
index 9fc2802..2ed80b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e33847a9b4c8affe5514ade86953711  grads-2.0.a7.1-src.tar.gz
+2009b3937d1754b173714b133339eb74  grads-2.0.a9-src.tar.gz