Merge pull request #75 from s-t-e-v-e-n-k/correct-python2-macro

Correct macro usage around installing python-mock
SUSE · Jan 16, 2023 · f208fad · f208fad
2 parents 4a12256 + 295b618
commit f208fad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/python-shaptools.changes b/python-shaptools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 13 02:13:36 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Correct macro usage, %ifpython2 is only suitable for Requires.
+
 -------------------------------------------------------------------
 Thu Jan  5 23:44:22 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
 

diff --git a/python-shaptools.spec b/python-shaptools.spec
@@ -20,6 +20,12 @@
 %bcond_without test
 %endif
 
+%if 0%{?sle_version} <= 150300 && !0%{?is_opensuse}
+%bcond_without python2
+%else
+%bcond_with python2
+%endif
+
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-shaptools
 Version:        0
@@ -32,7 +38,7 @@ Source:         %{name}-%{version}.tar.gz
 %if %{with test}
 BuildRequires:  %{python_module pytest}
 %endif
-%ifpython2
+%if %{with python2}
 BuildRequires:  python-mock
 %endif
 BuildRequires:  %{python_module setuptools}