Update to 2.7.0
This commit is contained in:
parent
3c671ebae4
commit
3b6233f126
|
@ -9,3 +9,4 @@
|
|||
/h5py-2.4.0.tar.gz
|
||||
/h5py-2.5.0.tar.gz
|
||||
/h5py-2.6.0.tar.gz
|
||||
/h5py-2.7.0.tar.gz
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -up h5py-2.6.0/lzf/lzf_filter.c.lzf h5py-2.6.0/lzf/lzf_filter.c
|
||||
--- h5py-2.6.0/lzf/lzf_filter.c.lzf 2015-11-28 14:44:47.000000000 -0700
|
||||
+++ h5py-2.6.0/lzf/lzf_filter.c 2016-04-10 08:58:19.399728714 -0600
|
||||
diff -up h5py-2.7.0/lzf/lzf_filter.c.lzf h5py-2.7.0/lzf/lzf_filter.c
|
||||
--- h5py-2.7.0/lzf/lzf_filter.c.lzf 2016-12-17 16:12:17.000000000 -0700
|
||||
+++ h5py-2.7.0/lzf/lzf_filter.c 2017-03-20 12:12:42.416002681 -0600
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
@ -10,10 +10,10 @@ diff -up h5py-2.6.0/lzf/lzf_filter.c.lzf h5py-2.6.0/lzf/lzf_filter.c
|
|||
#include "lzf_filter.h"
|
||||
|
||||
/* Our own versions of H5Epush_sim, as it changed in 1.8 */
|
||||
diff -up h5py-2.6.0/setup_build.py.lzf h5py-2.6.0/setup_build.py
|
||||
--- h5py-2.6.0/setup_build.py.lzf 2016-01-31 00:06:35.000000000 -0700
|
||||
+++ h5py-2.6.0/setup_build.py 2016-04-10 09:06:46.191168385 -0600
|
||||
@@ -31,9 +31,7 @@ MODULES = ['defs','_errors','_objects',
|
||||
diff -up h5py-2.7.0/setup_build.py.lzf h5py-2.7.0/setup_build.py
|
||||
--- h5py-2.7.0/setup_build.py.lzf 2016-12-17 16:12:17.000000000 -0700
|
||||
+++ h5py-2.7.0/setup_build.py 2017-03-20 12:14:01.575626772 -0600
|
||||
@@ -31,12 +31,10 @@ MODULES = ['defs','_errors','_objects',
|
||||
'h5ds', 'h5ac']
|
||||
|
||||
|
||||
|
@ -22,18 +22,13 @@ diff -up h5py-2.6.0/setup_build.py.lzf h5py-2.6.0/setup_build.py
|
|||
- localpath("lzf/lzf/lzf_d.c")]}
|
||||
+EXTRA_SRC = {'h5z': [ localpath("lzf/lzf_filter.c")]}
|
||||
|
||||
|
||||
if sys.platform.startswith('win'):
|
||||
@@ -45,7 +43,7 @@ if sys.platform.startswith('win'):
|
||||
|
||||
else:
|
||||
COMPILER_SETTINGS = {
|
||||
- 'libraries' : ['hdf5', 'hdf5_hl'],
|
||||
+ 'libraries' : ['hdf5', 'hdf5_hl', 'lzf'],
|
||||
'include_dirs' : [localpath('lzf'), '/opt/local/include', '/usr/local/include'],
|
||||
'library_dirs' : ['/opt/local/lib', '/usr/local/lib'],
|
||||
'define_macros' : [('H5_USE_16_API', None)] }
|
||||
@@ -101,10 +99,6 @@ class h5py_build_ext(build_ext):
|
||||
COMPILER_SETTINGS = {
|
||||
- 'libraries' : ['hdf5', 'hdf5_hl'],
|
||||
+ 'libraries' : ['hdf5', 'hdf5_hl', 'lzf'],
|
||||
'include_dirs' : [localpath('lzf')],
|
||||
'library_dirs' : [],
|
||||
'define_macros' : [('H5_USE_16_API', None)]
|
||||
@@ -103,10 +101,6 @@ class h5py_build_ext(build_ext):
|
||||
settings['include_dirs'].insert(0, op.join(config.hdf5, 'include'))
|
||||
settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
|
||||
|
||||
|
|
11
h5py.spec
11
h5py.spec
|
@ -5,17 +5,17 @@
|
|||
|
||||
Summary: A Python interface to the HDF5 library
|
||||
Name: h5py
|
||||
Version: 2.6.0
|
||||
Release: 7%{?dist}
|
||||
Version: 2.7.0
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Engineering
|
||||
License: BSD
|
||||
URL: http://www.h5py.org/
|
||||
Source0: https://pypi.python.org/packages/source/h/h5py/h5py-%{version}.tar.gz
|
||||
Source0: https://files.pythonhosted.org/packages/source/h/h5py/h5py-%{version}.tar.gz
|
||||
# patch to use a system liblzf rather than bundled liblzf
|
||||
Patch0: h5py-system-lzf.patch
|
||||
BuildRequires: liblzf-devel
|
||||
BuildRequires: hdf5-devel >= 1.8.3
|
||||
BuildRequires: python-devel >= 2.6
|
||||
BuildRequires: python2-devel >= 2.6
|
||||
BuildRequires: python-pkgconfig
|
||||
BuildRequires: python-six
|
||||
BuildRequires: python-sphinx
|
||||
|
@ -131,6 +131,9 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/*.so
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Mar 20 2017 Orion Poplawski <orion@cora.nwra.com> - 2.7.0-1
|
||||
- Update to 2.7.0
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue