From 5feca0adc7d5e61f1c7d727e4545cbbb3558630dee80225af2d5a0281be7b1bc Mon Sep 17 00:00:00 2001
From: Daniel Garcia <daniel.garcia@suse.com>
Date: Sun, 1 Mar 2026 21:13:45 +0000
Subject: [PATCH] Adapt %suse_version check, jsc#PED-15807

OBS-URL: https://build.opensuse.org/request/show/1335268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=127
(cherry picked from commit 0812b0b0f602d281b6ca6f76977089ee5a60b22353f2651e9120a76c022f435c)
---
 python-matplotlib.changes |  6 ++++++
 python-matplotlib.spec    | 12 +++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/python-matplotlib.changes b/python-matplotlib.changes
index 59d5b8d..98e860d 100644
--- a/python-matplotlib.changes
+++ b/python-matplotlib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 26 11:39:37 UTC 2026 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Adapt %suse_version checks to support new %suse_version design for
+  16.1 and following (1610, 1620, 1630...)
+
 -------------------------------------------------------------------
 Wed Feb 18 10:11:22 UTC 2026 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 8e3498c..1973263 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -16,8 +16,6 @@
 #
 
 
-%define SLE_VERSION 1600
-
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -38,7 +36,7 @@ ExclusiveArch:  x86_64 aarch64
 %endif
 
 # Disable wxWidgets backend in Factory Ring 1 (Minimal-X) and SLE <= 16
-%if %{with ringdisabled} || 0%{?suse_version} <= %SLE_VERSION
+%if %{with ringdisabled} || 0%{?suse_version} < 1699
 %bcond_with wx
 %else
 %bcond_without wx
@@ -126,7 +124,7 @@ BuildRequires:  %{python_module cairo >= 1.14.0}
 BuildRequires:  %{python_module cairocffi >= 0.8}
 # /SECTION cairo
 # SECTION nbagg backend tests: not in Minimal-X or SLE <= 16
-%if %{without ringdisabled} && 0%{?suse_version} > %SLE_VERSION
+%if %{without ringdisabled} && 0%{?suse_version} >= 1699
 BuildRequires:  %{python_module matplotlib-nbagg = %{version}}
 BuildRequires:  %{python_module nbconvert if %python-base >= 3.10}
 BuildRequires:  %{python_module nbformat if %python-base >= 3.10}
@@ -136,7 +134,7 @@ BuildRequires:  %{python_module nbformat if %python-base >= 3.10}
 %if %{with qt}
 BuildRequires:  %{python_module PyQt6}
 BuildRequires:  %{python_module matplotlib-qt = %{version}}
-%if %{without ringdisabled} && 0%{?suse_version} > %SLE_VERSION
+%if %{without ringdisabled} && 0%{?suse_version} >= 1699
 # Don'test Pyside6 in Minimal-X or Leap <=16
 BuildRequires:  python3-pyside6
 %endif
@@ -362,7 +360,7 @@ skip_tests+=" or png or svg or pdf"
 skip_tests+=" or (test_backend_pgf and test_rcupdate)"
 
 # Fails in SLFO:Main
-%if 0%{?suse_version} <= %SLE_VERSION
+%if 0%{?suse_version} < 1699
 # Timeout, this test freeze forever
 skip_tests+=" or test_determinism"
 skip_tests+=" or test_pcolormesh[png] or test_pcolormesh_alpha[png]"
@@ -497,7 +495,7 @@ $python -m pytest --pyargs matplotlib.tests \
 %{python_sitearch}/matplotlib/backends/_backend_gtk.py
 %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/_backend_gtk.*.py*
 
-%if 0%{?suse_version} > %SLE_VERSION
+%if 0%{?suse_version} >= 1699
 %files %{python_files nbagg}
 %license LICENSE/
 %{python_sitearch}/matplotlib/backends/backend_nbagg.py*