Support older and current versions of setuptools

Older versions of setuptools do not normalize the metadata directory,
whereas the newer does, so we need to support both cases.

_service

@@ -0,0 +1,3 @@
+<services>
+    <service name="download_files" mode="manual" />
+</services>

tbb.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Apr  3 05:23:16 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Support older and current versions of setuptools WRT to the case of
+  the metadata directory.
+
+-------------------------------------------------------------------
+Wed Jan  8 17:41:12 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Modernize building of the Python subpackage, don't generate *.egg.
+
+-------------------------------------------------------------------
+Tue Dec 31 13:57:21 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Remove use-FORTIFY_SOURCE-from-distribution.patch, as it is now
+  upstreamed
+
+- Use _service to download the source tarball
+
+- Update to version 2022.0.0:
+  * Extended the Flow Graph receiving nodes with a new 
+    try_put_and_wait API that submits a message to the graph and 
+    waits for its completion.
+  * Fixed the missed signal for thread request for enqueue 
+    operation
+  * Significantly improved scalability of task_group, flow_graph, 
+    and parallel_for_each
+  * Removed usage of std::aligned_storage deprecated in C++23
+  * Fixed the issue where oneapi::tbb::info interfaces might 
+    interfere with the process affinity mask on the Windows* OS 
+    systems with multiple processor groups.
+
 -------------------------------------------------------------------
 Fri Apr 19 03:16:09 UTC 2024 - Alessandro de Oliveira Faria <cabelo@opensuse.org>
 

tbb.spec

@@ -34,14 +34,13 @@
 %bcond_with test
 
 %if 0%{suse_version} >= 1500
-%{?!python_module:%define python_module() python3-%{**}}
 %bcond_without python3
 %define skip_python2 1
 %else
 %bcond_with python3
 %endif
 Name:           tbb
-Version:        2021.12.0
+Version:        2022.0.0
 Release:        0
 Summary:        oneAPI Threading Building Blocks (oneTBB)
 License:        Apache-2.0
@@ -52,7 +51,6 @@ Source99:       tbb-rpmlintrc
 # PATCH-FIX-OPENSUSE cmake-remove-include-path.patch -- openCV include error
 Patch2:         cmake-remove-include-path.patch
 Patch4:         add-cmake-check-for-libatomic-requirement-when-build.patch
-Patch5:         use-FORTIFY_SOURCE-from-distribution.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -60,6 +58,8 @@ BuildRequires:  hwloc-devel
 %if %{with python3}
 BuildRequires:  %{python_module devel >= 3.5}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros
 BuildRequires:  swig >= 3.0.6
 %endif
@@ -82,9 +82,10 @@ oneTBB provides you with functions, interfaces, and classes to parallelize and
 scale the code.
 
 %package -n libtbb%{so_ver}
-Summary:        Threading Building Blocks (TBB)
+Summary:        Core library for oneAPI Threading Building Blocks
 Group:          System/Libraries
 Provides:       %{name} = %{version}
+Provides:       onetbb = %{version}
 Obsoletes:      %{name} < %{version}
 
 %description -n libtbb%{so_ver}
@@ -97,7 +98,7 @@ scale the code.
 This package provides the core shared library corresponding to oneTBB.
 
 %package -n libtbbmalloc%{so_ver_malloc}
-Summary:        Threading Building Blocks (TBB)
+Summary:        Memory allocator library for oneAPI Threading Building Blocks
 Group:          System/Libraries
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
@@ -112,7 +113,7 @@ scale the code.
 This package provides the oneTBB memory allocator shared library.
 
 %package -n libirml%{so_ver_irml}
-Summary:        Threading Building Blocks (TBB) - IPC Library
+Summary:        IPC library for oneAPI Threading Building Blocks
 Group:          System/Libraries
 
 %description -n libirml%{so_ver_irml}
@@ -126,7 +127,7 @@ This subpackage provides the library required in order to enable inter-process
 (IPC) coordination between oneTBB schedulers for the oneTBB python module.
 
 %package -n libtbbbind%{tbbbind_suffix}-%{so_ver_bind}
-Summary:        NUMA support library for oneAPI Threading Building Blocks (oneTBB)
+Summary:        NUMA support library for oneAPI Threading Building Blocks
 Group:          System/Libraries
 
 %description -n libtbbbind%{tbbbind_suffix}-%{so_ver_bind}
@@ -140,7 +141,7 @@ The NUMA support library for oneTBB.
 
 %if 0%{?python_subpackage_only}
 %package -n python-%{name}
-Summary:        Python %{python_version} support for oneAPI Threading Building Blocks (oneTBB)
+Summary:        Python bindings for oneAPI Threading Building Blocks
 Group:          Development/Languages/Python
 Requires:       libirml%{so_ver_irml}
 
@@ -156,7 +157,7 @@ This package contains python %{python_version} bindings for oneTBB.
 %else
 
 %package -n python3-%{name}
-Summary:        Python 3 support for oneAPI Threading Building Blocks (oneTBB)
+Summary:        Python 3 bindings for oneAPI Threading Building Blocks
 Group:          Development/Languages/Python
 Requires:       libirml%{so_ver_irml}
 
@@ -225,7 +226,7 @@ cd ..
 # rebuild for every python flavor
 %if %{with python3}
 pushd python
-%python_build
+%pyproject_wheel
 popd
 %endif
 
@@ -238,8 +239,10 @@ source build/*/vars.sh
 
 %if %{with python3}
 pushd python
-%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%pyproject_install
+%{python_expand %fdupes %{buildroot}%{$python_sitearch}
+    rm -rfv %{buildroot}%{$python_sitearch}/TBB-%{version}*.egg
+}
 popd
 %endif
 
@@ -305,8 +308,7 @@ popd
 %files %{python_files %{name}}
 %{python_sitearch}/tbb
 %{python_sitearch}/TBB.py
-%{python_sitearch}/TBB-*py3*
-%{python_sitearch}/TBB-%{version}*-info
+%{python_sitearch}/[Tt][Bb][Bb]-%{version}.dist-info
 %pycache_only %{python_sitearch}/__pycache__/TBB*
 %endif
 

use-FORTIFY_SOURCE-from-distribution.patch

@@ -1,11 +0,0 @@
-diff -uNr oneTBB-2021.12.0.orig/cmake/compilers/GNU.cmake oneTBB-2021.12.0/cmake/compilers/GNU.cmake
---- oneTBB-2021.12.0.orig/cmake/compilers/GNU.cmake	2024-02-13 08:49:20.000000000 -0300
-+++ oneTBB-2021.12.0/cmake/compilers/GNU.cmake	2024-04-19 03:55:56.178055557 -0300
-@@ -75,7 +75,6 @@
- if (NOT APPLE AND NOT MINGW)
-     set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
- endif()
--set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2> )
- 
- 
- # TBB malloc settings