From c3d26207d67db263656e29af77f6ae96bd15af94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 5 May 2019 15:11:25 +0200 Subject: [PATCH] Update to 1.8.1 --- python-blosc-alt-arch.patch | 40 ------------------------------------- python-blosc.spec | 13 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 python-blosc-alt-arch.patch diff --git a/python-blosc-alt-arch.patch b/python-blosc-alt-arch.patch deleted file mode 100644 index eb999ad..0000000 --- a/python-blosc-alt-arch.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git python-blosc-1.5.1/setup.py~ python-blosc-1.5.1/setup.py -index fbb540c289..93bc0ac0e6 100644 ---- python-blosc-1.5.1/setup.py~ -+++ python-blosc-1.5.1/setup.py -@@ -19,7 +19,6 @@ import sys - from setuptools import Extension - from setuptools import setup - from glob import glob --import cpuinfo - - ########### Check versions ########## - -@@ -94,27 +93,6 @@ else: - inc_dirs += glob('c-blosc/internal-complibs/zstd*') - def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1), ('HAVE_ZSTD', 1)] - -- # Guess SSE2 or AVX2 capabilities -- cpu_info = cpuinfo.get_cpu_info() -- # SSE2 -- if 'sse2' in cpu_info['flags']: -- print('SSE2 detected') -- CFLAGS.append('-DSHUFFLE_SSE2_ENABLED') -- sources += [f for f in glob('c-blosc/blosc/*.c') if 'sse2' in f] -- if os.name == 'posix': -- CFLAGS.append('-msse2') -- elif os.name == 'nt': -- def_macros += [('__SSE2__', 1)] -- # AVX2 -- if 'avx2' in cpu_info['flags']: -- print('AVX2 detected') -- CFLAGS.append('-DSHUFFLE_AVX2_ENABLED') -- sources += [f for f in glob('c-blosc/blosc/*.c') if 'avx2' in f] -- if os.name == 'posix': -- CFLAGS.append('-mavx2') -- elif os.name == 'nt': -- def_macros += [('__AVX2__', 1)] -- - classifiers = """\ - Development Status :: 5 - Production/Stable - Intended Audience :: Developers diff --git a/python-blosc.spec b/python-blosc.spec index a4e4525..1b418e1 100644 --- a/python-blosc.spec +++ b/python-blosc.spec @@ -1,15 +1,13 @@ Summary: Python wrapper for the Blosc high performance compressor Name: python-blosc -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} License: MIT URL: https://github.com/Blosc/python-blosc Source0: https://github.com/Blosc/python-blosc/archive/v%{version}/blosc-%{version}.tar.gz -# remove the build-time CPU detection -Patch0: python-blosc-alt-arch.patch BuildRequires: gcc -BuildRequires: blosc-devel >= 1.9.0 +BuildRequires: blosc-devel >= 1.16.0 BuildRequires: numpy BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-numpy @@ -20,6 +18,7 @@ BuildRequires: python%{python3_pkgversion}-psutil %package -n python%{python3_pkgversion}-blosc Summary: Python wrapper for the blosc high performance compressor +Requires: blosc%{_isa} >= 1.16.0 %{?python_provide:%python_provide python%{python3_pkgversion}-blosc} %{?fedora:Recommends: python%{python3_pkgversion}-numpy} @@ -32,6 +31,7 @@ Summary: Python wrapper for the blosc high performance compressor %build export BLOSC_DIR=%{_libdir}/blosc CFLAGS="%{optflags}" +export DISABLE_BLOSC_AVX2=1 %py3_build %install @@ -48,6 +48,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %__python3 -c 'import sys, blosc; sys %doc README.rst RELEASE_NOTES.rst %changelog +* Sun May 5 2019 Zbigniew Jędrzejewski-Szmek - 1.8.1-1 +- Update to latest version (#1684965) + * Sat Feb 02 2019 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 9c638c8..8def156 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blosc-1.5.1.tar.gz) = d0575e05e6e33c86d7b4f1b20bc5b3d5160a883909add26f8bc42887df4fa57d402390fc9a9d3e6b66d569d41f88b20f78883098a015d8b85823e989b7ab076a +SHA512 (blosc-1.8.1.tar.gz) = f8cc5b38f2bdeac6b173e800313a3b71ba5b22b681e0ca90f3cdbf2fdb2c82826d478279297ffc2c91ce36ce21367c744e12b41e37a912deb4bdf1849e7359fa