[netcdf4-python] Update to 1.0.9

Orion Poplawski orion at fedoraproject.org
Fri May 9 21:25:55 UTC 2014


commit c039654b8f537d2345d0d4f002537e3b077d1859
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri May 9 15:26:21 2014 -0600

    Update to 1.0.9

 .gitignore                |    1 +
 netcdf4-python-libs.patch |   10 +++++-----
 netcdf4-python.spec       |   12 +++++++++---
 sources                   |    2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43c0348..f6048d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /netCDF4-1.0.2.tar.gz
 /netCDF4-1.0.7.tar.gz
 /v1.0.8rel.tar.gz
+/netcdf4-python-1.0.9-92c0a1c.tar.gz
diff --git a/netcdf4-python-libs.patch b/netcdf4-python-libs.patch
index 1d6054a..23096da 100644
--- a/netcdf4-python-libs.patch
+++ b/netcdf4-python-libs.patch
@@ -1,7 +1,7 @@
-diff -up netCDF4-1.0/setup.py.libs netCDF4-1.0/setup.py
---- netCDF4-1.0/setup.py.libs	2012-09-12 15:14:43.024761604 -0600
-+++ netCDF4-1.0/setup.py	2012-09-12 15:20:37.741745136 -0600
-@@ -149,8 +149,8 @@ NETCDF4_DIR environment variable not set
+diff -up netcdf4-python-92c0a1ca62b22d4173622122226c060de3c063c6/setup.py.libs netcdf4-python-92c0a1ca62b22d4173622122226c060de3c063c6/setup.py
+--- netcdf4-python-92c0a1ca62b22d4173622122226c060de3c063c6/setup.py.libs	2014-05-09 15:22:15.297854939 -0600
++++ netcdf4-python-92c0a1ca62b22d4173622122226c060de3c063c6/setup.py	2014-05-09 15:23:07.388567850 -0600
+@@ -243,8 +243,8 @@ NETCDF4_DIR environment variable not set
      if netCDF4_libdir is None and netCDF4_dir is not None:
          netCDF4_libdir = os.path.join(netCDF4_dir, 'lib')
  
@@ -9,6 +9,6 @@ diff -up netCDF4-1.0/setup.py.libs netCDF4-1.0/setup.py
 -    lib_dirs = [netCDF4_libdir,HDF5_libdir]
 +    libs = ['netcdf']
 +    lib_dirs = [netCDF4_libdir]
-     inc_dirs = [netCDF4_includedir,HDF5_includedir]
+     inc_dirs = [netCDF4_incdir,HDF5_incdir]
  
      # add szip to link if desired.
diff --git a/netcdf4-python.spec b/netcdf4-python.spec
index 067529d..8a35e2a 100644
--- a/netcdf4-python.spec
+++ b/netcdf4-python.spec
@@ -5,16 +5,19 @@
 %endif
 
 %global srcname distribute
+# Get hash for release from https://github.com/Unidata/netcdf4-python/releases
+%global commit 92c0a1ca62b22d4173622122226c060de3c063c6
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           netcdf4-python
-Version:        1.0.8
+Version:        1.0.9
 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/v%{version}rel.tar.gz
+Source0:        https://github.com/Unidata/netcdf4-python/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 # No rpath for library
 # http://code.google.com/p/netcdf4-python/issues/detail?id=138
 Patch0:         netcdf4-python-norpath.patch
@@ -90,7 +93,7 @@ containing vlens, and vlens containing compound types) are not supported.
 
 
 %prep
-%setup -q -n %{name}-%{version}rel
+%setup -q -n %{name}-%{commit}
 %patch0 -p1 -b .norpath
 %patch1 -p1 -b .libs
 
@@ -153,6 +156,9 @@ PYTHONPATH=$(echo ../build/lib.*) python3 run_all.py
 
 
 %changelog
+* Fri May 9 2014 Orion Poplawski <orion at cora.nwra.com> - 1.0.9-1
+- Update to 1.0.9
+
 * Thu Mar 6 2014 Orion Poplawski <orion at cora.nwra.com> - 1.0.8-1
 - Update to 1.0.8
 - Update URL/source to github
diff --git a/sources b/sources
index b0ef704..29bb3d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9abf13e641354155aaf71da534f30e1e  v1.0.8rel.tar.gz
+930a3dd9ede970030b192b1e94b6c602  netcdf4-python-1.0.9-92c0a1c.tar.gz


More information about the scm-commits mailing list