Add cf-prot.patch

Also, build with ninja, format the .spec file and
use the common URL format for source URLs

_service

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

cf-prot.patch

@@ -0,0 +1,23 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2025-07-17 10:15:40.088500829 +0200
+References: https://github.com/uxlfoundation/oneTBB/issues/1783
+
+-fcf-prot: not supported on this target
+[at least i586, armv7hl, ppc64le, s390x, probably also riscv64]
+---
+ cmake/compilers/GNU.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: oneTBB-2022.2.0/cmake/compilers/GNU.cmake
+===================================================================
+--- oneTBB-2022.2.0.orig/cmake/compilers/GNU.cmake
++++ oneTBB-2022.2.0/cmake/compilers/GNU.cmake
+@@ -107,7 +107,7 @@ endif ()
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
+     -fstack-protector-strong )
+-if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND NOT EMSCRIPTEN)
++if (FALSE)
+     set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fcf-protection=full>)
+ endif ()
+ set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fstack-clash-protection>)

tbb.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Thu Jul 17 08:16:41 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Drop excessive gcc flags: add cf-prot.patch.
+
+-------------------------------------------------------------------
+Mon Jun 30 19:18:22 UTC 2025 - Alessandro de Oliveira Faria <cabelo@opensuse.org>
+
+- Update to version 2022.2.0:
+  * Improved Hybrid CPU and NUMA Platforms API Support: Enhanced
+    API availability for better compatibility with Hybrid CPU and
+    NUMA platforms.
+  * Refined Environment Setup: Replaced CPATH with C_INCLUDE_PATH 
+    and CPLUS_INCLUDE_PATH in environment setup to avoid 
+    unintended compiler warnings caused by globally applied 
+    include paths.
+
+-------------------------------------------------------------------
+Tue May  6 13:19:31 UTC 2025 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Update to version 2022.1.0:
+  * Introduced the ONETBB_SPEC_VERSION macro to specify the version
+    of oneAPI specification implemented by the current version of
+    the library.
+  * blocked_nd_range is now a fully supported feature.
+
+- Migrated URLs to the new UXL Foundation organization
+- Use common URL format for Source URL
+- Format .spec file
+- Build with ninja 
+
+-------------------------------------------------------------------
+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

@@ -1,7 +1,7 @@
 #
 # spec file for package tbb
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2023 Alessandro de Oliveira Faria (A.K.A. CABELO)
 #
 # All modifications and additions to the file contributed by third parties
@@ -34,32 +34,34 @@
 %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.2.0
 Release:        0
 Summary:        oneAPI Threading Building Blocks (oneTBB)
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
-URL:            https://oneapi-src.github.io/oneTBB/
+URL:            https://uxlfoundation.github.io/oneTBB/
-Source0:        https://github.com/oneapi-src/oneTBB/archive/v%{version}.tar.gz#/tbb-%{version}.tar.gz
+Source0:        https://github.com/uxlfoundation/oneTBB/archive/v%{version}/%{name}-%{version}.tar.gz
 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
+Patch5:         cf-prot.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  hwloc-devel
+BuildRequires:  ninja
 %if %{with python3}
 BuildRequires:  %{python_module devel >= 3.5}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros
 BuildRequires:  swig >= 3.0.6
 %endif
@@ -82,9 +84,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 +100,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 +115,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 +129,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 +143,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 +159,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}
 
@@ -198,6 +201,8 @@ sed -i 's/version\s*="0.2"/version = "%{version}"/' python/setup.py
 sed -i '1{/^#!.*env python/ d}' python/TBB.py python/tbb/*.py
 
 %build
+# Use ninja to build
+%define __builder ninja
 # HWLOC: no automatic find on SLE-12 (older cmake)
 # TBB_TEST: don't compile by default
 # TBB4PY: use cmake build system to build libirml in the python tree
@@ -225,7 +230,7 @@ cd ..
 # rebuild for every python flavor
 %if %{with python3}
 pushd python
-%python_build
+%pyproject_wheel
 popd
 %endif
 
@@ -238,8 +243,10 @@ source build/*/vars.sh
 
 %if %{with python3}
 pushd python
-%python_install
+%pyproject_install
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%{python_expand %fdupes %{buildroot}%{$python_sitearch}
+    rm -rfv %{buildroot}%{$python_sitearch}/TBB-%{version}*.egg
+}
 popd
 %endif
 
@@ -305,8 +312,7 @@ popd
 %files %{python_files %{name}}
 %{python_sitearch}/tbb
 %{python_sitearch}/TBB.py
-%{python_sitearch}/TBB-*py3*
+%{python_sitearch}/[Tt][Bb][Bb]-%{version}.dist-info
-%{python_sitearch}/TBB-%{version}*-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