From 49ac3743f884cc1102371daa17830b9b0157311a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mar 11 2016 16:18:30 +0000
Subject: Update to 1.2.3


- Drop numpy patch
- Use %license

---

diff --git a/.gitignore b/.gitignore
index a15de1b..9397a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /netcdf4-python-1.1.4.tar.gz
 /netcdf4-python-1.1.6.tar.gz
 /netcdf4-python-1.2.2.tar.gz
+/netcdf4-python-1.2.3.tar.gz
diff --git a/netcdf4-python-numpy1.11.patch b/netcdf4-python-numpy1.11.patch
deleted file mode 100644
index 29f64d6..0000000
--- a/netcdf4-python-numpy1.11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up netcdf4-python-1.2.2rel/Changelog.numpy1.11 netcdf4-python-1.2.2rel/Changelog
-diff -up netcdf4-python-1.2.2rel/test/tst_masked.py.numpy1.11 netcdf4-python-1.2.2rel/test/tst_masked.py
---- netcdf4-python-1.2.2rel/test/tst_masked.py.numpy1.11	2015-12-31 09:07:06.000000000 -0700
-+++ netcdf4-python-1.2.2rel/test/tst_masked.py	2016-02-05 16:44:44.341533935 -0700
-@@ -28,7 +28,8 @@ ranarr[::2] = missing_value
- ranarr2[::2] = missing_value2
- NP.seterr(invalid='ignore') # silence warnings from ma.masked_values
- maskedarr = ma.masked_values(ranarr,missing_value)
--maskedarr2 = ma.masked_values(ranarr2,missing_value2)
-+#maskedarr2 = ma.masked_values(ranarr2,missing_value2)
-+maskedarr2 = ma.masked_invalid(ranarr2)
- scale_factor = (packeddata.max()-packeddata.min())/(2.*32766.)
- add_offset = 0.5*(packeddata.max()+packeddata.min())
- packeddata2 = NP.around((packeddata-add_offset)/scale_factor).astype('i2')
-diff --git a/test/tst_multifile.py b/test/tst_multifile.py
-index 3e4c1dc..ffe5106 100644
---- a/test/tst_multifile.py
-+++ b/test/tst_multifile.py
-@@ -29,7 +29,7 @@ def setUp(self):
-             dat = f.createVariable('data','i',('x','y','z',))
-             dat.long_name = 'phony data'
-             dat.missing_value = missval
--            nx1 = nfile*ninc; nx2 = ninc*(nfile+1)
-+            nx1 = int(nfile*ninc); nx2 = int(ninc*(nfile+1))
-             #x[0:ninc] = np.arange(nfile*ninc,ninc*(nfile+1))
-             x[:] = np.arange(nfile*ninc,ninc*(nfile+1))
-             #dat[0:ninc] = data[nx1:nx2]
-diff --git a/test/tst_multifile2.py b/test/tst_multifile2.py
-index 0a59013..34b21a1 100644
---- a/test/tst_multifile2.py
-+++ b/test/tst_multifile2.py
-@@ -30,7 +30,7 @@ def setUp(self):
-             dat = f.createVariable('data','i',('x','y','z',))
-             dat.long_name = 'phony data'
-             dat.missing_value = missval
--            nx1 = nfile*ninc; nx2 = ninc*(nfile+1)
-+            nx1 = int(nfile*ninc); nx2 = int(ninc*(nfile+1))
-             #x[0:ninc] = np.arange(nfile*ninc,ninc*(nfile+1))
-             x[:] = np.arange(nfile*ninc,ninc*(nfile+1))
-             #dat[0:ninc] = data[nx1:nx2]
diff --git a/netcdf4-python.spec b/netcdf4-python.spec
index 0978a14..5441813 100644
--- a/netcdf4-python.spec
+++ b/netcdf4-python.spec
@@ -7,7 +7,7 @@
 %global srcname distribute
 
 Name:           netcdf4-python
-Version:        1.2.2
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
@@ -21,9 +21,6 @@ Patch0:         netcdf4-python-norpath.patch
 # Don't link against hdf5 and z libraries
 # http://code.google.com/p/netcdf4-python/issues/detail?id=139
 Patch1:         netcdf4-python-libs.patch
-# Upstream fix for numpy 1.11
-# https://github.com/Unidata/netcdf4-python/commit/c6fe43007510d5130de06bf9083c2bfcd45fc6c3.patch
-Patch2:         netcdf4-python-numpy1.11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel
@@ -100,7 +97,6 @@ containing vlens, and vlens containing compound types) are not supported.
 %setup -q -n %{name}-%{version}rel
 %patch0 -p1 -b .norpath
 %patch1 -p1 -b .libs
-%patch2 -p1 -b .numpy1.11
 # This uses the network
 rm test/tst_dap.py
 
@@ -134,7 +130,8 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
 
 
 %files
-%doc Changelog COPYING docs examples README.md
+%license COPYING
+%doc Changelog docs examples README.md
 %{_bindir}/nc3tonc4
 %{_bindir}/nc4tonc3
 %{_bindir}/ncinfo
@@ -142,12 +139,18 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
 
 %if 0%{?with_python3}
 %files -n netcdf4-python3
-%doc Changelog COPYING docs examples README.md
+%license COPYING
+%doc Changelog docs examples README.md
 %{python3_sitearch}/*
 %endif # with_python3
 
 
 %changelog
+* Fri Mar 11 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.3-1
+- Update to 1.2.3
+- Drop numpy patch
+- Use %%license
+
 * Sun Feb 7 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-1
 - Update to 1.2.2
 - Modernize spec
diff --git a/sources b/sources
index 5ab70c1..06e22d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3e2d276f1b45fa28635a0d35d0f36ee  netcdf4-python-1.2.2.tar.gz
+b8dc0ff3ffa6f3299a34dda536bf5a10  netcdf4-python-1.2.3.tar.gz