From 632c50fd7a19dc4935de2763bf859111c867125c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 23 Apr 2014 23:01:29 -0600
Subject: [PATCH] Update to 4.3.2

- Drop utf8 patch fixed upstream
- Re-enable MPI tests
---
 .gitignore        |  1 +
 netcdf-utf8.patch | 13 -------------
 netcdf.spec       | 36 ++++++++++++++++++------------------
 sources           |  2 +-
 4 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 netcdf-utf8.patch

diff --git a/.gitignore b/.gitignore
index 6220783..4393cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ netcdf-4.1.1.tar.gz
 /netcdf-4.2.1.1.tar.gz
 /netcdf-4.3.0.tar.gz
 /v4.3.1.1.tar.gz
+/netcdf-4.3.2.tar.gz
diff --git a/netcdf-utf8.patch b/netcdf-utf8.patch
deleted file mode 100644
index 08617fb..0000000
--- a/netcdf-utf8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/netcdf.h b/include/netcdf.h
-index 3e0b349..58e7fb1 100644
---- a/include/netcdf.h
-+++ b/include/netcdf.h
-@@ -171,7 +171,7 @@ Use this in mode flags for both nc_create() and nc_open(). */
- 
- /** Extended format specifier returned by  nc_inq_format_extended() 
-  *  Added in version 4.3.1. This returns the true format of the
-- *  underlying data‥
-+ *  underlying data
-  * The function returns two values
-  * 1. a small integer indicating the underlying source type
-  *    of the data. Note that this may differ from what the user
diff --git a/netcdf.spec b/netcdf.spec
index 2e486d5..033c132 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,20 +1,16 @@
 Name:           netcdf
-Version:        4.3.1.1
-Release:        3%{?dist}
+Version:        4.3.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/
 # Use github tarball - the unidata download is missing files
-Source0:        https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz
+Source0:        https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.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
+# Use pkgconfig in nc-config to avoid multi-lib issues
 Patch0:         netcdf-pkgconfig.patch
-# Strip utf-8 character from netcdf.h for now
-# https://github.com/Unidata/netcdf-c/issues/29
-Patch1:         netcdf-utf8.patch
 
 BuildRequires:  chrpath
 BuildRequires:  doxygen
@@ -185,7 +181,6 @@ NetCDF parallel openmpi static libraries
 %prep
 %setup -q -n %{name}-c-%{version}
 %patch0 -p1 -b .pkgconfig
-%patch1 -p1 -b .utf8
 
 
 %build
@@ -255,12 +250,12 @@ make -C build check
 # This is hanging here:
 # Testing very simple parallel I/O with 4 processors...
 # *** tst_parallel testing very basic parallel access.
-#for mpi in %{mpi_list}
-#do
-#  module load mpi/$mpi-%{_arch}
-#  make -C $mpi check
-#  module purge
-#done
+for mpi in %{mpi_list}
+do
+  module load mpi/$mpi-%{_arch}
+  make -C $mpi check
+  module purge
+done
 %endif
 
 
@@ -270,7 +265,7 @@ make -C build check
 
 
 %files
-%doc COPYRIGHT README
+%doc COPYRIGHT README.md RELEASE_NOTES.md
 %{_bindir}/nccopy
 %{_bindir}/ncdump
 %{_bindir}/ncgen
@@ -291,7 +286,7 @@ make -C build check
 
 %if %{with_mpich}
 %files mpich
-%doc COPYRIGHT README
+%doc COPYRIGHT README.md RELEASE_NOTES.md
 %{_libdir}/mpich/bin/nccopy
 %{_libdir}/mpich/bin/ncdump
 %{_libdir}/mpich/bin/ncgen
@@ -312,7 +307,7 @@ make -C build check
 
 %if %{with_openmpi}
 %files openmpi
-%doc COPYRIGHT README
+%doc COPYRIGHT README.md RELEASE_NOTES.md
 %{_libdir}/openmpi/bin/nccopy
 %{_libdir}/openmpi/bin/ncdump
 %{_libdir}/openmpi/bin/ncgen
@@ -333,6 +328,11 @@ make -C build check
 
 
 %changelog
+* Wed Apr 23 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-1
+- Update to 4.3.2
+- Drop utf8 patch fixed upstream
+- Re-enable MPI tests
+
 * Fri Mar 7 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.1.1-3
 - Strip UTF-8 character from netcdf.h for now, causes problems with
   netcdf4-python build
diff --git a/sources b/sources
index edf6c44..e563d27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24f7f5fd13e0b01ef83de223e05c1ba1  v4.3.1.1.tar.gz
+6d0a2a1e2bd854390062f4a808dd94c4  netcdf-4.3.2.tar.gz