diff --git a/.gitignore b/.gitignore index 6f3ee82..8ea5f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /tables-3.1.1.tar.gz /pytablesmanual-3.1.1.pdf /PyTables-16191801a53eddae8ca9380a28988c3b5b263c5e.tar.gz +/v.3.2.0.tar.gz +/pytablesmanual-3.2.0.pdf diff --git a/always-use-blosc.diff b/always-use-blosc.diff index 48e0015..0e3f298 100644 --- a/always-use-blosc.diff +++ b/always-use-blosc.diff @@ -1,16 +1,14 @@ -diff --git ./tables-3.1.1/tables/utilsextension.pyx~ ./tables-3.1.1/tables/utilsextension.pyx -index ebc0446d5f..01e5b3b790 100644 ---- tables-3.1.1/tables/utilsextension.pyx~ -+++ tables-3.1.1/tables/utilsextension.pyx -@@ -234,11 +234,6 @@ cdef register_blosc_(): - # This function detects if blosc can work correctly on the current platform. +--- PyTables-v.3.2.0/tables/utilsextension.pyx~ 2015-05-06 10:10:43.000000000 -0400 ++++ PyTables-v.3.2.0/tables/utilsextension.pyx 2015-05-07 19:03:11.439144042 -0400 +@@ -276,11 +276,6 @@ + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661286). # This function has been written by Julian Taylor . def _arch_without_blosc(): -- import platform -- arch = platform.machine().lower() -- for a in ["arm", "sparc", "mips"]: -- if a in arch: -- return True - return False +- import platform +- arch = platform.machine().lower() +- for a in ("arm", "sparc", "mips", "aarch64"): +- if a in arch: +- return True + return False - # Only register bloc compressor on platforms that actually support it. + if blosc_version and blosc_version < ('1', '4') and _arch_without_blosc(): diff --git a/python-tables.spec b/python-tables.spec index 104a174..002a840 100644 --- a/python-tables.spec +++ b/python-tables.spec @@ -5,19 +5,20 @@ %global module tables -%global commit 16191801a53eddae8ca9380a28988c3b5b263c5e -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +#global commit 16191801a53eddae8ca9380a28988c3b5b263c5e +#global shortcommit %(c=%{commit}; echo ${c:0:7}) # Use the same directory of the main package for subpackage licence and docs %global _docdir_fmt %{name} Summary: Hierarchical datasets in Python Name: python-%{module} -Version: 3.1.2 -Release: 4%{?dist}.git%{shortcommit} -Source0: https://github.com/PyTables/PyTables/archive/%{commit}/PyTables-%{commit}.tar.gz +Version: 3.2.0 +Release: 1%{?dist}%{?gitcommit:.git%{shortcommit}} +#Source0: https://github.com/PyTables/PyTables/archive/%{commit}/PyTables-%{commit}.tar.gz +Source0: https://github.com/PyTables/PyTables/archive/v.%{version}.tar.gz -Source1: https://sourceforge.net/projects/pytables/files/pytables/%{version}/pytablesmanual-3.1.1.pdf +Source1: https://sourceforge.net/projects/pytables/files/pytables/%{version}/pytablesmanual-%{version}.pdf Patch0: always-use-blosc.diff License: BSD @@ -61,8 +62,7 @@ The %{name}-doc package contains the documentation related to PyTables. %prep -%setup -q -n PyTables-%{commit} -%patch0 -p1 +%autosetup -n PyTables-v.%{version} -p1 echo "import sys, tables; sys.exit(tables.test())" > bench/check_all.py rm -rf %{py3dir} cp -a . %{py3dir} @@ -119,6 +119,9 @@ popd %doc examples/ %changelog +* Thu May 7 2015 Zbigniew Jędrzejewski-Szmek - 3.2.0-1 +- Update to 3.2.0 + * Thu Jan 8 2015 Zbigniew Jędrzejewski-Szmek - 3.1.2-4.git1619180 - Use blosc on all architectures diff --git a/sources b/sources index 5d484e1..3b88176 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -64883c5df5a38e29b48189b32b1e9c16 PyTables-16191801a53eddae8ca9380a28988c3b5b263c5e.tar.gz -e85c217843325eee1a6f4e3a72ddb04d pytablesmanual-3.1.1.pdf +42be2edc582c5057c61b8fda328be3ec v.3.2.0.tar.gz +e9dea04353a75e979fa93b18a1595e6e pytablesmanual-3.2.0.pdf