From aad6ed5ccda7f403231140ca910a56e0f669a2a3739a5f79a73773565c2ef573 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Thu, 26 Jan 2023 11:20:09 +0000
Subject: [PATCH] Accepting request 1061185 from
 home:bnavigator:branches:devel:languages:python:numeric

- Avoid i586 segfaults with Qt5/Matplotlib:
  * Remove i586 malloc workarounds for memory allocation
  * Don't test balanced model reduction on 32-bit

OBS-URL: https://build.opensuse.org/request/show/1061185
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-control?expand=0&rev=40
---
 python-control.changes |  7 +++++++
 python-control.spec    | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/python-control.changes b/python-control.changes
index beab255..c130b98 100644
--- a/python-control.changes
+++ b/python-control.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 26 09:40:27 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Avoid i586 segfaults with Qt5/Matplotlib:
+  * Remove i586 malloc workarounds for memory allocation
+  * Don't test balanced model reduction on 32-bit
+
 -------------------------------------------------------------------
 Sat Dec 31 19:48:37 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-control.spec b/python-control.spec
index ccf3e86..5253fbb 100644
--- a/python-control.spec
+++ b/python-control.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-control
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,6 @@ BuildRequires:  %{python_module pytest-xvfb}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module scipy >= 1.3}
 BuildRequires:  %{python_module slycot}
-BuildRequires:  libjemalloc2
 # /SECTION
 %python_subpackages
 
@@ -69,11 +68,12 @@ sed -i '1{\@^#!/usr/bin/env@ d}' control/tests/*.py
 # The default Agg backend does not define the toolbar attribute in the Figure
 # Manager used by some tests, so we run the tests with the Qt5 backend
 export MPLBACKEND="Qt5Agg"
-# preload malloc library to avoid free() error on i586 architecture
-if [[ $(getconf LONG_BIT) == 32 ]]; then
-export LD_PRELOAD="%{_libdir}/libjemalloc.so.2"
-fi
-%pytest
+donttest="dummyprefix"
+# gh#python-control/python-control#838
+[ "${RPM_ARCH}" != "x86_64" ] && donttest="$donttest or (test_optimal_doc and shooting-3-u0-None)"
+# causes i586 segfaults in matplotlib after successful balanced model reduction tests
+[ $(getconf LONG_BIT) -eq 32 ] && donttest="$donttest or testBalredMatchDC"
+%pytest -k "not (${donttest})"
 
 %files %{python_files}
 %doc ChangeLog README.rst