From 13ba9a9ffb1f0858dc1719e3caf8b686571806a25846022f25925c08953cd2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Thu, 28 Mar 2024 08:03:04 +0000
Subject: [PATCH] Accepting request 1162951 from home:ecsos:python

- Fix build error in Leap.
  - Disable one more test.
  - Drop macro %dnl because it works only in rpm version >= 4.15.
    Leap hast 4.14 at this time.
    Also enable it.
  - Fix some python3 typos in spec.

OBS-URL: https://build.opensuse.org/request/show/1162951
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=121
---
 python-tox.changes | 10 ++++++++++
 python-tox.spec    |  8 +++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/python-tox.changes b/python-tox.changes
index 83750cd..d1f35df 100644
--- a/python-tox.changes
+++ b/python-tox.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 27 16:33:24 UTC 2024 - ecsos <ecsos@opensuse.org>
+
+- Fix build error in Leap.
+  - Disable one more test.
+  - Drop macro %dnl because it works only in rpm version >= 4.15.
+    Leap hast 4.14 at this time.
+    Also enable it.
+  - Fix some python3 typos in spec.
+
 -------------------------------------------------------------------
 Mon Mar 25 19:22:38 UTC 2024 - Dan Čermák <dcermak@suse.com>
 
diff --git a/python-tox.spec b/python-tox.spec
index 5723d89..4e1f54e 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -57,7 +57,7 @@ BuildRequires:  %{python_module wheel >= 0.42}
 %if %{with devpi_process}
 BuildRequires:  %{python_module devpi-process > 1}
 %endif
-%dnl BuildRequires:  %{python_module importlib-metadata >= 6.8}
+BuildRequires:  %{python_module importlib-metadata >= 6.8}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  unzip
@@ -70,8 +70,8 @@ Requires:       python-platformdirs >= 4.1
 Requires:       python-pluggy >= 1.3
 Requires:       python-pyproject-api >= 1.6.1
 Requires:       python-virtualenv >= 20.24.3
-%dnl Requires:       (python-importlib-metadata >= 0.12 if python3-base < 3.8)
-Requires:       (python-tomli >= 2.0.1 if python3-base < 3.11)
+Requires:       (python-importlib-metadata >= 0.12 if python-base < 3.8)
+Requires:       (python-tomli >= 2.0.1 if python-base < 3.11)
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 # last detox version is 0.19
@@ -145,6 +145,8 @@ donttest+=" or test_call_as_exe or test_skip_pkg_install"
 donttest+=" or test_python_generate_hash_seed"
 # this test doesn't work on aarch64
 donttest+=" or test_bad_env_var"
+# this test doesn't work on Leap
+donttest+=" or test_package_cmd_builder"
 
 %{python_expand # tests expect an active virtualenv with a clean python name as sys.executable
 virtualenv-%{$python_bin_suffix} --system-site-packages testenv-%{$python_bin_suffix}