[gdl: 3/10] Update to latest cvs, new netcdf patch for EL5

[Orion Poplawski]

commit 6bfb31117dfab07dd8c1524585fb76ce20e08f2b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Mar 29 15:23:16 2011 -0600

    Update to latest cvs, new netcdf patch for EL5

 gdl-0.9-hdf.patch    |   11 -----------
 gdl-0.9-netcdf.patch |   25 +++++++++++++++++++------
 gdl.spec             |   10 +++++-----
 3 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/gdl-0.9-netcdf.patch b/gdl-0.9-netcdf.patch
index 2fa8947..6adbde5 100644
--- a/gdl-0.9-netcdf.patch
+++ b/gdl-0.9-netcdf.patch
@@ -1,11 +1,24 @@
---- gdl-0.9-cvs/CMakeModules/FindNetCDF.cmake.netcdf	2010-07-16 07:26:09.000000000 -0600
-+++ gdl-0.9-cvs/CMakeModules/FindNetCDF.cmake	2011-03-18 14:27:47.993962330 -0600
-@@ -6,7 +6,7 @@
+--- gdl-0.9-cvs/CMakeModules/FindNetCDF.cmake.netcdf	2011-03-28 09:07:53.000000000 -0600
++++ gdl-0.9-cvs/CMakeModules/FindNetCDF.cmake	2011-03-29 14:35:09.611273399 -0600
+@@ -5,18 +5,17 @@
+ 	include(FindPkgConfig)
  	pkg_check_modules(NETCDF netcdf)
  	if(NETCDF_FOUND)
- 		set(NETCDF_INCLUDE_DIR ${NETCDF_INCLUDE_DIRS})
--		find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIR)
-+		find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES)
+-		set(NETCDF_INCLUDE_DIR ${NETCDF_INCLUDE_DIRS})
+ 		find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES)
  	endif(NETCDF_FOUND)
  else(NETCDFPKG) # no netcdf.pc file
  	find_library(NETCDF_LIBRARIES NAMES netcdf)
+-	find_path(NETCDF_INCLUDE_DIR NAMES netcdfcpp.h)	
+-	find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIR)
++	find_path(NETCDF_INCLUDE_DIRS NAMES netcdfcpp.h PATH_SUFFIXES netcdf-3)	
++	find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS)
+ endif(NETCDFPKG)
+ 
+ mark_as_advanced(
+ NETCDFPKG
+ NETCDF
+-NETCDF_INCLUDE_DIR
++NETCDF_INCLUDE_DIRS
+ NETCDF_LIBRARIES
+ )
diff --git a/gdl.spec b/gdl.spec
index 22e2226..02e515c 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -12,10 +12,8 @@ Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
 Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
-#NETCDF_INCLUDE_DIRS can be empty
+# Find netcdf on EL5 (/usr/include/netcdf-3)
 Patch10:        gdl-0.9-netcdf.patch
-#Missing quotes on HDF_LIBRARIES
-Patch11:        gdl-0.9-hdf.patch
 #Change to numpy
 Patch12:        gdl-0.9-numpy.patch
 # Build with system antlr library.  Request for upstream change here:
@@ -86,7 +84,6 @@ Provides:       %{name}-runtime = %{version}-%{release}
 %setup -q -n %{name}-%{version}-cvs
 rm -rf src/antlr
 %patch10 -p1 -b .netcdf
-%patch11 -p1 -b .hdf
 %patch12 -p1 -b .numpy
 %patch13 -p1 -b .antlr
 %patch14 -p1 -b .config
@@ -132,6 +129,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 install -d -m 0755 $RPM_BUILD_ROOT/%{python_sitearch}
 mv $RPM_BUILD_ROOT/%{_prefix}/lib/libgdl.so \
                 $RPM_BUILD_ROOT/%{python_sitearch}/GDL.so
+ls -l $RPM_BUILD_ROOT/%{_prefix}/lib/libgdl.so \
+                $RPM_BUILD_ROOT/%{python_sitearch}/GDL.so
 rm -r $RPM_BUILD_ROOT/%{_prefix}/lib
 popd
 
@@ -142,9 +141,10 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 
 
 %check
-ctest
 cd testsuite
 echo ".r test_suite" | ../build/src/gdl
+cd build
+ctest
 
 
 %clean