diff --git a/python-numpy.changes b/python-numpy.changes index 2d7d96c..7467e9e 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 29 09:57:08 UTC 2019 - Andreas Schwab + +- riscv.patch: Remove obsolete patch + ------------------------------------------------------------------- Sat Oct 19 17:04:18 UTC 2019 - Arun Persaud diff --git a/python-numpy.spec b/python-numpy.spec index 886141a..1a54d86 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -81,8 +81,6 @@ Source99: python-numpy-rpmlintrc Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch -# PATCH-FIX-UPSTREAM riscv.patch -- Add support for RISC-V -Patch2: riscv.patch # # PATCH-FIX-SLE fix-py34-tests.patch -- python 3.4 support Patch3: fix-py34-tests.patch Patch4: s390x.patch @@ -156,7 +154,6 @@ This package contains files for developing applications using numpy. %setup -q -n numpy-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %ifarch s390x %patch4 -p1 diff --git a/riscv.patch b/riscv.patch deleted file mode 100644 index 6d9f729..0000000 --- a/riscv.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -@@ -18,6 +18,7 @@ - * NPY_CPU_ARCEL - * NPY_CPU_ARCEB - * NPY_CPU_RISCV64 -+ * NPY_CPU_RISCV - */ - #ifndef _NPY_CPUARCH_H_ - #define _NPY_CPUARCH_H_ -@@ -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 - #error Unknown CPU, please report this to numpy maintainers with \ - information about your platform (OS, CPU and compiler)