[netcdf4-python] Update to 1.1.3

[Orion Poplawski]

commit d37ae69a20d9659faa927684240a58ea499ad8ab
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Dec 21 21:43:43 2014 -0700

    Update to 1.1.3

 .gitignore                   |    1 +
 netcdf4-python-norpath.patch |   22 +++++++++++-----------
 netcdf4-python.spec          |   19 +++++++++----------
 sources                      |    2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b82689..2c0fe62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /v1.0.8rel.tar.gz
 /netcdf4-python-1.0.9-92c0a1c.tar.gz
 /netcdf4-python-1.1.0-26cdeda.tar.gz
+/netcdf4-python-1.1.3.tar.gz
diff --git a/netcdf4-python-norpath.patch b/netcdf4-python-norpath.patch
index 919860e..46fea39 100644
--- a/netcdf4-python-norpath.patch
+++ b/netcdf4-python-norpath.patch
@@ -1,21 +1,21 @@
-diff -up netCDF4-1.0.7/setup.py.norpath netCDF4-1.0.7/setup.py
---- netCDF4-1.0.7/setup.py.norpath	2014-02-06 22:42:40.689954718 -0700
-+++ netCDF4-1.0.7/setup.py	2014-02-06 22:43:16.600723399 -0700
-@@ -295,7 +295,7 @@ else:
+diff -up netcdf4-python-1.1.3rel/setup.py.norpath netcdf4-python-1.1.3rel/setup.py
+--- netcdf4-python-1.1.3rel/setup.py.norpath	2014-12-21 20:35:18.536765054 -0700
++++ netcdf4-python-1.1.3rel/setup.py	2014-12-21 20:36:01.689592389 -0700
+@@ -313,7 +313,7 @@ else:
  if has_cython and 'sdist' not in sys.argv[1:]:
      sys.stdout.write('using Cython to compile netCDF4.pyx...\n')
      # recompile netCDF4.pyx
--    extensions = [Extension("netCDF4",["netCDF4.pyx"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs)]
-+    extensions = [Extension("netCDF4",["netCDF4.pyx"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs)]
+-    extensions = [Extension("netCDF4",["netCDF4.pyx"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs),
++    extensions = [Extension("netCDF4",["netCDF4.pyx"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs),
+                   Extension('netcdftime._datetime', ['netcdftime/_datetime.pyx'])]
      # remove netCDF4.c file if it exists, so cython will recompile netCDF4.pyx.
      if len(sys.argv) >= 2 and 'build' in sys.argv[1:] and os.path.exists('netCDF4.c'):
-         os.remove('netCDF4.c')
-@@ -327,7 +327,7 @@ if has_cython and 'sdist' not in sys.arg
+@@ -343,7 +343,7 @@ if has_cython and 'sdist' not in sys.arg
      cmdclass = {'build_ext': build_ext}
  else:
      # use existing netCDF4.c, don't need cython.
--    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs)]
-+    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs)]
+-    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs),
++    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs),
+                   Extension('netcdftime._datetime', ['netcdftime/_datetime.c'])]
      cmdclass = {}
  
- setup(name = "netCDF4",
diff --git a/netcdf4-python.spec b/netcdf4-python.spec
index 8b48b14..4943737 100644
--- a/netcdf4-python.spec
+++ b/netcdf4-python.spec
@@ -5,19 +5,16 @@
 %endif
 
 %global srcname distribute
-# Get hash for release from https://github.com/Unidata/netcdf4-python/releases
-%global commit 26cdeda69a3ff2efe438020390a876234a23550a
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           netcdf4-python
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
 Group:          Development/Languages
 License:        MIT
 URL:            https://github.com/Unidata/netcdf4-python
-Source0:        https://github.com/Unidata/netcdf4-python/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:        https://github.com/Unidata/netcdf4-python/archive/v%{version}rel.tar.gz#/%{name}-%{version}.tar.gz
 # No rpath for library
 # http://code.google.com/p/netcdf4-python/issues/detail?id=138
 Patch0:         netcdf4-python-norpath.patch
@@ -39,8 +36,6 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-Cython
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-numpy
-# For 2to3
-BuildRequires:  python-tools
 %endif # if with_python3
 BuildRequires:  netcdf-devel
 
@@ -99,14 +94,15 @@ containing vlens, and vlens containing compound types) are not supported.
 
 
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-%{version}rel
 %patch0 -p1 -b .norpath
 %patch1 -p1 -b .libs
+# This uses the network
+rm test/tst_dap.py
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
-2to3 --write --nobackups %{py3dir}
 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
 %endif # with_python3
 
@@ -162,6 +158,9 @@ PYTHONPATH=$(echo ../build/lib.*) python3 run_all.py
 
 
 %changelog
+* Sun Dec 21 2014 Orion Poplawski <orion at cora.nwra.com> - 1.1.3-1
+- Update to 1.1.3
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 2e0f6ef..04a7a2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29f818e05d6cc71f640ec76bb23ea83a  netcdf4-python-1.1.0-26cdeda.tar.gz
+7ce650fbb2a7457d0a7f125b134edbe3  netcdf4-python-1.1.3.tar.gz