[h5py] 2.0.1 docs is removed rebase patch

[terjeros]

commit 0d7ccfad524cffd5d339463f9aeabb088c151c48
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Jan 24 11:41:07 2012 +0100

    2.0.1
    docs is removed
    rebase patch

 .gitignore                  |    1 +
 h5py-1.3.1-system-lzf.patch |   34 ----------------------------------
 h5py-2.0.1-system-lzf.patch |   37 +++++++++++++++++++++++++++++++++++++
 h5py.spec                   |   31 +++++++++++++++----------------
 sources                     |    2 +-
 5 files changed, 54 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b199464..0790e6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /h5py-1.3.1.tar.gz
+/h5py-2.0.1.tar.gz
diff --git a/h5py-2.0.1-system-lzf.patch b/h5py-2.0.1-system-lzf.patch
new file mode 100644
index 0000000..a7c7f54
--- /dev/null
+++ b/h5py-2.0.1-system-lzf.patch
@@ -0,0 +1,37 @@
+diff --git a/lzf/lzf_filter.c b/lzf/lzf_filter.c
+index c6dd4b0..08579a7 100644
+--- a/lzf/lzf_filter.c
++++ b/lzf/lzf_filter.c
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include "hdf5.h"
+-#include "lzf/lzf.h"
++#include "lzf.h"
+ #include "lzf_filter.h"
+ 
+ /* Our own versions of H5Epush_sim, as it changed in 1.8 */
+diff --git a/setup.py b/setup.py
+index dc6d6ac..dddb95e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -57,7 +57,7 @@ if sys.platform.startswith('win'):
+         COMPILER_SETTINGS['library_dirs'] += [op.join(HDF5, 'dll')]
+ else:
+     COMPILER_SETTINGS = {
+-       'libraries'      : ['hdf5'],
++       'libraries'      : ['hdf5', 'lzf'],
+        'include_dirs'   : [numpy.get_include(), localpath('lzf')],
+        'library_dirs'   : [],
+        'define_macros'  : [('H5_USE_16_API', None)]
+@@ -77,9 +77,7 @@ MODULES =  ['defs','_errors','_objects','_proxy', 'h5fd', 'h5z',
+             'h5d', 'h5a', 'h5f', 'h5g',
+             'h5l', 'h5o']
+ 
+-EXTRA_SRC = {'h5z': [ localpath("lzf/lzf_filter.c"), 
+-                      localpath("lzf/lzf/lzf_c.c"),
+-                      localpath("lzf/lzf/lzf_d.c")]}
++EXTRA_SRC = {'h5z': [ localpath("lzf/lzf_filter.c")]}
+ 
+ def make_extension(module):
+     sources = [op.join('h5py', module+SUFFIX)] + EXTRA_SRC.get(module, [])
diff --git a/h5py.spec b/h5py.spec
index beabe47..9220f2f 100644
--- a/h5py.spec
+++ b/h5py.spec
@@ -1,20 +1,21 @@
 %{?filter_provides_in: %filter_provides_in .*/h5py/.*\.so}
 %{?filter_setup}
 
+# TODO: py3 support + enable tests
+
 Summary:        A Python interface to the HDF5 library
 Name:           h5py
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://h5py.alfven.org/
 Source0:        http://h5py.googlecode.com/files/h5py-%{version}.tar.gz
 # patch to use a system liblzf rather than bundled liblzf
-Patch0:         h5py-1.3.1-system-lzf.patch
-BuildRequires:  python-devel
-BuildRequires:  python-nose
+Patch0:         h5py-2.0.1-system-lzf.patch
+BuildRequires:  python-devel >= 2.6
 BuildRequires:  python-sphinx
-BuildRequires:  hdf5-devel >= 1.8.2
+BuildRequires:  hdf5-devel >= 1.8.3
 BuildRequires:  numpy >= 1.0.3
 BuildRequires:  liblzf-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,14 +39,8 @@ simplifies the process of reading and writing data from Python.
 rm -rf lzf/lzf
 
 %build
-export CC="%{__cc}"
 export CFLAGS="%{optflags} -fopenmp -llzf"
-%{__python} setup.py configure --hdf5=%{_libdir} --api=18
 %{__python} setup.py build
-# build docs 
-dir=$(basename build/lib.linux-*)
-PYTHONPATH=$(pwd)/build/$dir make -C docs html
-rm -f docs/build/html/.buildinfo
 
 %install
 rm -rf %{buildroot}
@@ -53,19 +48,23 @@ rm -rf %{buildroot}
 chmod 0755 %{buildroot}%{python_sitearch}/%{name}/*.so
 
 %check
-%{__python} setup.py nosetests
+#{__python} setup.py test
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt LICENSE.txt h5py.egg-info licenses 
-%doc docs/build/html
+%doc ANN.txt README.txt
 %{python_sitearch}/%{name}/
-%{python_sitearch}/%{name}-%{version}-*.egg-info/
+%{python_sitearch}/%{name}-%{version}-*.egg-info
 
 %changelog
+* Tue Jan 24 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.0.1-1
+- 2.0.1
+- docs is removed
+- rebase patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index c8d1555..ffe3bed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfef84992d33910a06371dc35becb71b  h5py-1.3.1.tar.gz
+ea271f5cc8a78a531316918906aacdd0  h5py-2.0.1.tar.gz