- Explicitly link libnetcdf to the hdf libraries, don't link with -lcurl

netcdf-4.1-beta2-hdf5.patch

@@ -0,0 +1,11 @@
+--- netcdf-4.1-snapshot2009111008/libsrc4/Makefile.in.hdf5	2009-11-10 08:38:09.000000000 -0700
++++ netcdf-4.1-snapshot2009111008/libsrc4/Makefile.in	2009-11-11 16:58:44.846340629 -0700
+@@ -791,7 +791,7 @@
+ # Our output library will also include contents of the netcdf3
+ # convenience library.
+ libnetcdf_la_LIBADD = ../libsrc/libnetcdf3.la $(am__append_11) \
+-	$(am__append_12) $(am__append_13)
++	$(am__append_12) $(am__append_13) -lhdf5_hl -lhdf5
+ @BUILD_V2_TRUE@TST_V2 = tst_v2 
+ 
+ # Netcdf-4 source.

netcdf-4.1-beta2-libs.patch

@@ -0,0 +1,38 @@
+--- netcdf-4.1-snapshot2009111008/configure.libs	2009-11-10 08:38:04.000000000 -0700
++++ netcdf-4.1-snapshot2009111008/configure	2009-11-11 20:24:32.932280524 -0700
+@@ -3420,7 +3420,7 @@
+   curl_cflags="-I$with_curl/include"
+   curl_dir="$with_curl"
+ else
+-  curl_cflags=-lcurl
++  curl_cflags=
+   curl_libs=
+   curl_dir=
+ fi
+@@ -31317,7 +31317,7 @@
+    LDFLAGS="${LDFLAGS} -L${HDF5DIR}/lib"
+    CPPFLAGS="${CPPFLAGS} -I${HDF5DIR}/include"
+ fi
+-LIBS="${LIBS} -lm -lz -lhdf5"
++LIBS="${LIBS} -lz -lhdf5"
+ 
+ # Add the HDF4 directory and library if needed.
+ if test "x$enable_hdf4" = xyes; then
+@@ -33122,7 +33122,7 @@
+    if test "x$ZLIBDIR" != x ; then
+       NC_LIBS="$NC_LIBS -L$ZLIBDIR/lib"
+    fi
+-   NC_LIBS="$NC_LIBS -lz -lm $LIBS"
++   NC_LIBS="$NC_LIBS -lz $LIBS"
+    if test "x$SZLIBDIR" != x ; then
+       NC_LIBS="$NC_LIBS -L$SZLIBDIR/lib"
+       NC_LIBS="$NC_LIBS -lsz $LIBS"
+@@ -33138,7 +33138,7 @@
+     if test "x$with_daplib" != x ; then
+        NC_LIBS="$NC_LIBS -L$with_daplib/lib"
+     fi
+-    NC_LIBS="$NC_LIBS $CURL_LIBS"
++    NC_LIBS="$NC_LIBS"
+ fi
+ if test "x$enable_separate_fortran" = xyes ; then
+    NC_FLIBS="-lnetcdff $NC_LIBS"

netcdf.spec

@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.1.0
-Release:        0.4.2009111008%{?dist}
+Release:        0.5.2009111008%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -8,8 +8,12 @@ License:        NetCDF
 URL:            http://www.unidata.ucar.edu/software/netcdf/
 #Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
 Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/snapshot/netcdf-4-daily.tar.gz
+#Explicitly link libnetcdf.so to the hdf5 libraries
+Patch1:         netcdf-4.1-beta2-hdf5.patch
 #Use pkgconfig in nc-config to avoid multi-lib issues
 Patch2:         netcdf-4.1-beta2-pkgconfig.patch
+#Remove some unneeded library linkages
+Patch3:         netcdf-4.1-beta2-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -74,7 +78,9 @@ This package contains the netCDF static libs.
 
 %prep
 %setup -q -n netcdf-4.1-snapshot2009111008
+%patch1 -p1 -b .hdf5
 %patch2 -p1 -b .pkgconfig
+%patch3 -p1 -b .libs
 
 
 %build
@@ -82,8 +88,7 @@ export F77="gfortran"
 export FC="gfortran"
 export FFLAGS="${RPM_OPT_FLAGS}"
 export FCFLAGS="$FFLAGS"
-%configure CPPFLAGS=-I%{_includedir}/hdf \
-           LDFLAGS=-L%{_libdir}/hdf \
+%configure \
            --enable-shared \
            --enable-netcdf-4 \
            --enable-dap \
@@ -158,6 +163,9 @@ fi
 
 
 %changelog
+* Wed Nov 11 2009 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.5.2009111008
+- Explicitly link libnetcdf to the hdf libraries, don't link with -lcurl
+
 * Wed Nov 11 2009 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.4.2009111008
 - Add Requires: libcurl-devel to devel package