From e149f0cb5be0df90614c46321806bae717eca3c8b937dfa369c759c58a3a8fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Mon, 15 Jan 2024 13:46:02 +0000
Subject: [PATCH 1/2] Accepting request 1138114 from
 home:Simmphonie:branches:devel:languages:python:numeric

- Fix gnu-hpc build error for Leap

OBS-URL: https://build.opensuse.org/request/show/1138114
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=149
---
 python-numpy.changes | 5 +++++
 python-numpy.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/python-numpy.changes b/python-numpy.changes
index 330a696..c2e832b 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 07:33:45 UTC 2024 - Torsten Gruner <simmphonie@opensuse.org>
+
+- Fix gnu-hpc build error for Leap
+
 -------------------------------------------------------------------
 Wed Dec 27 12:57:32 UTC 2023 - ecsos <ecsos@opensuse.org>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index ef4f62a..2b3004e 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -201,10 +201,6 @@ sed -i '1s/^#!.*$//' numpy/random/_examples/cython/*.pyx
 rm -f PKG-INFO
 
 %build
-%if 0%{?suse_version} <= 1600
-export CC=gcc-12
-export CXX=g++-12
-%endif
 %define _lto_cflags %{nil}
 %if %{with hpc}
 %hpc_setup
@@ -219,6 +215,10 @@ EOF
 %else
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %endif
+%if 0%{?suse_version} <= 1600
+export CC=gcc-12
+export CXX=g++-12
+%endif
 
 %pyproject_wheel
 

From 6dc21206c3b78693dcf2bd5ec8f01b78e39d9e2340e52e627f5527291318ebf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Tue, 16 Jan 2024 15:01:46 +0000
Subject: [PATCH 2/2] Accepting request 1139053 from
 home:Andreas_Schwab:Factory

- Update list of expected test failures on riscv64

OBS-URL: https://build.opensuse.org/request/show/1139053
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=150
---
 python-numpy.changes | 5 +++++
 python-numpy.spec    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/python-numpy.changes b/python-numpy.changes
index c2e832b..35c422f 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 15 16:35:46 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- Update list of expected test failures on riscv64
+
 -------------------------------------------------------------------
 Thu Jan 11 07:33:45 UTC 2024 - Torsten Gruner <simmphonie@opensuse.org>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index 2b3004e..81cf851 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -339,8 +339,9 @@ test_failok+=" or (test_umath and test_unary_spurious_fpexception)"
 %ifarch riscv64
 # These tests fail due to non-portable assumptions about the signbit of NaN
 # gh#numpy/numpy#8213
-test_failok+=" or test_fpclass"
-test_failok+=" or test_float"
+test_failok+=" or (test_umath and test_fpclass)"
+test_failok+=" or (test_numeric and TestBoolCmp and test_float)"
+test_failok+=" or (test_umath and test_fp_noncontiguous)"
 %endif
 
 echo "