From 7a38c6b203eed68f46795e3e75057850acc461fa Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Apr 23 2014 03:25:02 +0000
Subject: Update to 2.3.0


---

diff --git a/.gitignore b/.gitignore
index 3b53170..b63c6ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /h5py-2.1.3.tar.gz
 /h5py-2.2.0.tar.gz
 /h5py-2.2.1.tar.gz
+/h5py-2.3.0.tar.gz
diff --git a/h5py-2.2.0-system-lzf.patch b/h5py-2.2.0-system-lzf.patch
deleted file mode 100644
index 27256d1..0000000
--- a/h5py-2.2.0-system-lzf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 d92ee52..293b1ac 100755
---- a/setup.py
-+++ b/setup.py
-@@ -120,7 +120,7 @@ if sys.platform.startswith('win'):
-         COMPILER_SETTINGS['library_dirs'] += [op.join(HDF5, 'dll')]
- else:
-     COMPILER_SETTINGS = {
--       'libraries'      : ['hdf5', 'hdf5_hl'],
-+       'libraries'      : ['hdf5', 'hdf5_hl', 'lzf'],
-        'include_dirs'   : [numpy.get_include(), localpath('lzf')],
-        'library_dirs'   : [],
-        'define_macros'  : [('H5_USE_16_API', None)]
-@@ -167,9 +167,8 @@ if HAVE_CYTHON:
- else:
-     configure.printerr("Cython not present; building for HDF5 1.8.4+")
- 
--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-system-lzf.patch b/h5py-system-lzf.patch
new file mode 100644
index 0000000..eadcdd6
--- /dev/null
+++ b/h5py-system-lzf.patch
@@ -0,0 +1,36 @@
+diff -up h5py-2.3.0/lzf/lzf_filter.c.lzf h5py-2.3.0/lzf/lzf_filter.c
+--- h5py-2.3.0/lzf/lzf_filter.c.lzf	2014-04-22 07:00:04.000000000 -0600
++++ h5py-2.3.0/lzf/lzf_filter.c	2014-04-22 21:14:07.109003123 -0600
+@@ -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 -up h5py-2.3.0/setup.py.lzf h5py-2.3.0/setup.py
+--- h5py-2.3.0/setup.py.lzf	2014-04-22 07:00:04.000000000 -0600
++++ h5py-2.3.0/setup.py	2014-04-22 21:14:25.104369896 -0600
+@@ -146,7 +146,7 @@ if sys.platform.startswith('win'):
+             shutil.copy(op.join(HDF5, 'bin', f), localpath('h5py', f))
+ else:
+     COMPILER_SETTINGS = {
+-       'libraries'      : ['hdf5', 'hdf5_hl'],
++       'libraries'      : ['hdf5', 'hdf5_hl', 'lzf'],
+        'include_dirs'   : [localpath('lzf')],
+        'library_dirs'   : [],
+        'define_macros'  : [('H5_USE_16_API', None)]
+@@ -193,9 +193,8 @@ if HAVE_CYTHON:
+ else:
+     configure.printerr("Cython not present; building for HDF5 1.8.4+")
+ 
+-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 3be0246..01dced7 100644
--- a/h5py.spec
+++ b/h5py.spec
@@ -5,14 +5,14 @@
 
 Summary:        A Python interface to the HDF5 library
 Name:           h5py
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Group:          Applications/Engineering
 License:        BSD
-URL:            http://h5py.alfven.org/
-Source0:        http://h5py.googlecode.com/files/h5py-%{version}.tar.gz
+URL:            http://www.h5py.org/
+Source0:        https://pypi.python.org/packages/source/h/h5py/h5py-%{version}.tar.gz
 # patch to use a system liblzf rather than bundled liblzf
-Patch0:         h5py-2.2.0-system-lzf.patch
+Patch0:         h5py-system-lzf.patch
 BuildRequires:  liblzf-devel
 BuildRequires:  hdf5-devel >= 1.8.3
 BuildRequires:  python-devel >= 2.6
@@ -63,7 +63,7 @@ This is the Python 3 version of h5py.
 %prep
 %setup -q
 # use system libzlf and remove private copy
-%patch0 -p1
+%patch0 -p1 -b .lzf
 rm -rf lzf/lzf
 %{__python} api_gen.py
 %if 0%{?with_python3}
@@ -72,7 +72,7 @@ cp -a . %{py3dir}
 %endif
 
 %build
-export CFLAGS="%{optflags} -fopenmp -llzf"
+export CFLAGS="%{optflags} -fopenmp"
 %{__python} setup.py build
 
 %if 0%{?with_python3}
@@ -118,6 +118,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Apr 22 2014 Orion Poplawski <orion@cora.nwra.com> - 2.3.0-1
+- Update to 2.3.0
+
 * Sun Jan 5 2014 Orion Poplawski <orion@cora.nwra.com> - 2.2.1-2
 - Rebuild for hdf5 1.8.12
 - Add requires for hdf5 version
diff --git a/sources b/sources
index b4c5afa..ab9fe30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07ac707287b4be7d77b73f1afac6980b  h5py-2.2.1.tar.gz
+785435a86d9e4bd40acc968b718b0c6a  h5py-2.3.0.tar.gz