Update to 1.5.6
This commit is contained in:
parent
190f00179a
commit
470bfd4652
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@
|
|||||||
/netcdf4-python-1.5.3.tar.gz
|
/netcdf4-python-1.5.3.tar.gz
|
||||||
/netcdf4-python-1.5.4.tar.gz
|
/netcdf4-python-1.5.4.tar.gz
|
||||||
/netcdf4-python-1.5.5.1.tar.gz
|
/netcdf4-python-1.5.5.1.tar.gz
|
||||||
|
/netcdf4-python-1.5.6.tar.gz
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
diff -up netcdf4-python-1.5.3rel/setup.py.libs netcdf4-python-1.5.3rel/setup.py
|
|
||||||
--- netcdf4-python-1.5.3rel/setup.py.libs 2019-10-24 17:10:13.959050887 -0600
|
|
||||||
+++ netcdf4-python-1.5.3rel/setup.py 2019-10-24 17:10:13.963050895 -0600
|
|
||||||
@@ -359,7 +359,7 @@ def _populate_hdf5_info(dirstosearch, in
|
|
||||||
if HDF5_libdir is not None: lib_dirs.append(HDF5_libdir)
|
|
||||||
if HDF5_incdir is not None: inc_dirs.append(HDF5_incdir)
|
|
||||||
|
|
||||||
- libs.extend(['hdf5_hl', 'hdf5'])
|
|
||||||
+ #libs.extend(['hdf5_hl', 'hdf5'])
|
|
||||||
|
|
||||||
|
|
||||||
dirstosearch = [os.path.expanduser('~'), '/usr/local', '/sw', '/opt',
|
|
||||||
@@ -425,7 +425,7 @@ NETCDF4_DIR environment variable not set
|
|
||||||
if sys.platform == 'win32':
|
|
||||||
libs.extend(['netcdf', 'zlib'])
|
|
||||||
else:
|
|
||||||
- libs.extend(['netcdf', 'z'])
|
|
||||||
+ libs.extend(['netcdf'])
|
|
||||||
|
|
||||||
if netCDF4_libdir is not None: lib_dirs.append(netCDF4_libdir)
|
|
||||||
if netCDF4_incdir is not None: inc_dirs.append(netCDF4_incdir)
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: netcdf4-python
|
Name: netcdf4-python
|
||||||
Version: 1.5.5.1
|
Version: 1.5.6
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Python/numpy interface to netCDF
|
Summary: Python/numpy interface to netCDF
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -9,9 +9,6 @@ Source0: https://github.com/Unidata/netcdf4-python/archive/v%{version}rel
|
|||||||
# No rpath for library
|
# No rpath for library
|
||||||
# http://code.google.com/p/netcdf4-python/issues/detail?id=138
|
# http://code.google.com/p/netcdf4-python/issues/detail?id=138
|
||||||
Patch0: netcdf4-python-norpath.patch
|
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
|
|
||||||
|
|
||||||
%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
@ -110,10 +107,11 @@ containing vlens, and vlens containing compound types) are not supported.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}rel
|
%setup -q -n %{name}-%{version}rel
|
||||||
%patch0 -p1 -b .norpath
|
%patch0 -p1 -b .norpath
|
||||||
%patch1 -p1 -b .libs
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
# Set to get libs from ncconfig to avoid directly linking to -lhdf5
|
||||||
|
export USE_NCCONFIG=1
|
||||||
%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
||||||
%py2_build
|
%py2_build
|
||||||
%endif
|
%endif
|
||||||
@ -168,6 +166,9 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Feb 14 2021 Orion Poplawski <orion@nwra.com> - 1.5.6-1
|
||||||
|
- Update to 1.5.6
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5.1-2
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (netcdf4-python-1.5.5.1.tar.gz) = 89911b525154b894546f940f742a2ee25dc67c86c02b232ab2fac8136be10b28c99344ab4609095bb21081dce30b747cc8d15c5c7483596ec14d2c30a645aafa
|
SHA512 (netcdf4-python-1.5.6.tar.gz) = c21803994302989dcaa6202d874c1cbfbf0606f130b231d021e85947da3c67604e218d194ca4b1f2f8eed0d407d52abf4e2459057be60b06f84cb0de49c33444
|
||||||
|
Loading…
Reference in New Issue
Block a user