diff --git a/ctypeslib2-suse-remove-info-check.patch b/ctypeslib2-suse-remove-info-check.patch index e7679cf..ea0742b 100644 --- a/ctypeslib2-suse-remove-info-check.patch +++ b/ctypeslib2-suse-remove-info-check.patch @@ -37,3 +37,25 @@ Index: ctypeslib-2.3.4/pyproject.toml dynamic = ["version"] [project.urls] +From 12425beba8db4c3074bb045d80a07be8ad722ade Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Wed, 26 Apr 2023 11:00:41 +0200 +Subject: [PATCH] Switch clang and clang_py versions + +--- + ctypeslib/clang2py.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ctypeslib/clang2py.py b/ctypeslib/clang2py.py +index 10c29a1..49133bc 100755 +--- a/ctypeslib/clang2py.py ++++ b/ctypeslib/clang2py.py +@@ -260,7 +260,7 @@ def windows_dlls(option, opt, value, _parser): # pylint: disable=unused-argumen + + def version_string(): + version = "versions - %(prog)s:" \ +- f"{ctypeslib.__version__} python-clang:{clang_version()} clang:{clang_py_version()} " \ ++ f"{ctypeslib.__version__} python-clang:{clang_py_version()} clang:{clang_version()} " \ + f"clang_filename:{ctypeslib.__clang_library_filename}" # pylint: disable=protected-access + return version + \ No newline at end of file diff --git a/python-ctypeslib2.changes b/python-ctypeslib2.changes index 8b6cffb..9b712cd 100644 --- a/python-ctypeslib2.changes +++ b/python-ctypeslib2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 25 15:22:11 UTC 2023 - Ben Greiner + +- Update ctypeslib2-suse-remove-info-check.patch +- Prevent failing 15.5 build until clang is available for the + SLE15 python smodule (forget dead Py 3.6) + ------------------------------------------------------------------- Mon Apr 24 21:34:46 UTC 2023 - Ben Greiner diff --git a/python-ctypeslib2.spec b/python-ctypeslib2.spec index 2e4ee49..cd1db5c 100644 --- a/python-ctypeslib2.spec +++ b/python-ctypeslib2.spec @@ -16,20 +16,24 @@ # -# Until python3-clang is converted to multiflavor, we have the primary flavor only -# Please keep the multiflavor macro usage in the specfile consistent. -%define pythons python3 -# help in the rename from multiflavor to python3 only -%define primary_python3 python%{python3_version_nodots} %ifarch %{ix86} x86_64 %bcond_without test %else %bcond_with test %endif + %if 0%{suse_version} >= 1599 # Tumbleweed default 16 is not compatible %define clangmajor 15 +# Until python3-clang is converted to multiflavor, we have the primary flavor only +# Please keep the multiflavor macro usage in the specfile consistent. +%define pythons python3 +# help in the rename from multiflavor to python3 only +%define primary_python3 python%{python3_version_nodots} +%else +%{?sle15_python_module_pythons} %endif + Name: python-ctypeslib2 Version: 2.3.4 Release: 0 @@ -43,8 +47,8 @@ Patch1: ctypeslib2-suse-remove-info-check.patch BuildRequires: %{python_module clang%{?clangmajor} >= 11} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools >= 57} +BuildRequires: %{python_module setuptools_scm >= 7} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module wheel} BuildRequires: clang%{?clangmajor} >= 11