[netcdf: 1/2] Update to 4.1.2 (soname bump) Add patch to add -lm to libnetcdf4

[Orion Poplawski]

commit cdf7f78362e3bdb0c39c1d023fa33a54a659e22c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Mar 31 12:00:28 2011 -0600

    Update to 4.1.2 (soname bump)
    Add patch to add -lm to libnetcdf4

 .gitignore                       |    1 +
 netcdf-4.1-beta2-pkgconfig.patch |   34 ----------------------------------
 netcdf-4.1.1-fflags.patch        |   13 -------------
 netcdf-4.1.1-hdf5.patch          |   12 ------------
 netcdf-4.1.2-libm.patch          |   11 +++++++++++
 netcdf.spec                      |   31 +++++++++++++++----------------
 sources                          |    2 +-
 7 files changed, 28 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb433a3..34b0b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 netcdf-4.1.1.tar.gz
+/netcdf-4.1.2.tar.gz
diff --git a/netcdf-4.1.2-libm.patch b/netcdf-4.1.2-libm.patch
new file mode 100644
index 0000000..9c2eae4
--- /dev/null
+++ b/netcdf-4.1.2-libm.patch
@@ -0,0 +1,11 @@
+--- netcdf-4.1.2/libsrc4/Makefile.in.libm	2011-03-29 17:14:04.000000000 -0600
++++ netcdf-4.1.2/libsrc4/Makefile.in	2011-03-31 11:09:36.683165942 -0600
+@@ -312,7 +312,7 @@
+ # Tell libtool what libraries are we will depend on.
+ 
+ # Always link to hdf5_hl, hdf5, and z.
+-libnetcdf4_la_LIBADD = $(am__append_12) $(am__append_13) -lhdf5_hl \
++libnetcdf4_la_LIBADD = -lm $(am__append_12) $(am__append_13) -lhdf5_hl \
+ 	-lhdf5 -lz
+ all: all-am
+ 
diff --git a/netcdf.spec b/netcdf.spec
index 0f25394..8020d8b 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,17 +1,19 @@
 Name:           netcdf
-Version:        4.1.1
-Release:        4%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://www.unidata.ucar.edu/software/netcdf/
-Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-4.1.1.tar.gz
+Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz
+#Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/snapshot/netcdf-4-daily.tar.gz
 #Use pkgconfig in nc-config to avoid multi-lib issues
-Patch0:         netcdf-4.1-beta2-pkgconfig.patch
-Patch1:         netcdf-4.1.1-fflags.patch
-#Explicitly link libnetcdf.so agains -lhdf5_hl -lhdf5, reported upstream
-Patch2:         netcdf-4.1.1-hdf5.patch
+Patch0:         netcdf-4.1.2-pkgconfig.patch
+#Strip FFLAGS from nc-config
+Patch1:         netcdf-4.1.2-fflags.patch
+# Need to add -lm to libnetcdf4
+Patch2:         netcdf-4.1.2-libm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -80,7 +82,7 @@ This package contains the netCDF static libs.
 %setup -q
 %patch0 -p1 -b .pkgconfig
 %patch1 -p1 -b .fflags
-%patch2 -p1 -b .hdf5
+%patch2 -p1 -b .libm
 
 
 %build
@@ -94,14 +96,8 @@ export FCFLAGS="$FFLAGS"
            --enable-dap \
            --enable-ncgen4 \
            --enable-extra-example-tests \
-%ifnarch s390 s390x
-           --enable-valgrind-tests \
-%endif
            --disable-dap-remote-tests
-#Need to be able to properly list all hdf4 library deps and location
-#           --enable-hdf4 \
-
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -143,7 +139,6 @@ fi
 %{_bindir}/ncgen3
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
-%{_datadir}/doc/netcdf
 %{_infodir}/*
 
 %files devel
@@ -165,6 +160,10 @@ fi
 
 
 %changelog
+* Thu Mar 31 2011 Orion Poplawski <orion at cora.nwra.com> - 4.1.2-1
+- Update to 4.1.2 (soname bump)
+- Add patch to add -lm to libnetcdf4
+
 * Mon Jul 19 2010 Dan Horák <dan[at]danny.cz> - 4.1.1-4
 - no valgrind on s390(x)
 
diff --git a/sources b/sources
index f2a712c..6f77609 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99cb93a15c4687cb7983e794f4f0ea9e  netcdf-4.1.1.tar.gz
+4a94ebe2d998d649159aa5665c83fb1a  netcdf-4.1.2.tar.gz