diff --git a/numpy-1.14.5.zip b/numpy-1.14.5.zip deleted file mode 100644 index 652a5fd..0000000 --- a/numpy-1.14.5.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac -size 4904624 diff --git a/numpy-1.15.2.zip b/numpy-1.15.2.zip new file mode 100644 index 0000000..9332942 --- /dev/null +++ b/numpy-1.15.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1 +size 4484511 diff --git a/numpy-1.9.0-remove-__declspec.patch b/numpy-1.9.0-remove-__declspec.patch index f8d5764..ba31c39 100644 --- a/numpy-1.9.0-remove-__declspec.patch +++ b/numpy-1.9.0-remove-__declspec.patch @@ -15,12 +15,12 @@ safely removed. --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py -@@ -163,7 +163,7 @@ +@@ -166,7 +166,7 @@ ] # variable attributes tested via "int %s a" % attribute -OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"] +OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"] - # Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h + # Subset of OPTIONAL_STDFUNCS which may already have HAVE_* defined by Python.h OPTIONAL_STDFUNCS_MAYBE = [ diff --git a/python-numpy.changes b/python-numpy.changes index 06497e4..650cdbe 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 24 14:56:59 UTC 2018 - Todd R + +- Update to version 1.15.2 + Changes documented in release notes: + https://github.com/numpy/numpy/blob/master/doc/release/1.15.2-notes.rst +- Update to version 1.15.1 + Changes documented in release notes: + https://github.com/numpy/numpy/blob/master/doc/release/1.15.1-notes.rst +- Update to version 1.15.0 + Changes documented in release notes: + https://github.com/numpy/numpy/blob/master/doc/release/1.15.0-notes.rst +- Update to version 1.14.6 + Changes documented in release notes: + https://github.com/numpy/numpy/blob/master/doc/release/1.14.6-notes.rst +- Rebase numpy-1.9.0-remove-__declspec.patch +- Rebase riscv.patch + ------------------------------------------------------------------- Wed Jun 13 18:14:49 UTC 2018 - toddrme2178@gmail.com diff --git a/python-numpy.spec b/python-numpy.spec index a389243..6d74459 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -18,8 +18,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.14.5 -%define _ver 1_14_5 +%define ver 1.15.2 +%define _ver 1_15_2 %define pname python-numpy %bcond_with ringdisabled @@ -169,7 +169,7 @@ This package contains files for developing applications using numpy. %patch1 -p1 %patch2 -p1 # Fix non-executable scripts -sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py %build %if %{with hpc} diff --git a/riscv.patch b/riscv.patch index d4e123c..6d9f729 100644 --- a/riscv.patch +++ b/riscv.patch @@ -2,18 +2,18 @@ Index: numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h =================================================================== --- numpy-1.14.0.orig/numpy/core/include/numpy/npy_cpu.h +++ numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h -@@ -17,6 +17,7 @@ - * NPY_CPU_SH_BE +@@ -18,6 +18,7 @@ * NPY_CPU_ARCEL * NPY_CPU_ARCEB + * NPY_CPU_RISCV64 + * NPY_CPU_RISCV */ #ifndef _NPY_CPUARCH_H_ #define _NPY_CPUARCH_H_ -@@ -82,6 +83,8 @@ - #define NPY_CPU_ARCEL - #elif defined(__arc__) && defined(__BIG_ENDIAN__) +@@ -102,6 +103,8 @@ #define NPY_CPU_ARCEB + #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 + #define NPY_CPU_RISCV64 +#elif defined(__riscv) + #define NPY_CPU_RISCV #else