diff --git a/tbb-2022.0.0.tar.gz b/tbb-2022.2.0.tar.gz similarity index 32% rename from tbb-2022.0.0.tar.gz rename to tbb-2022.2.0.tar.gz index 0f163961e11911af10805333dfa0a431a6b264bc..3f88a4c7d6cd4a28cc30faab57efb2af0b33bced 100644 --- a/tbb-2022.0.0.tar.gz +++ b/tbb-2022.2.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a -size 2654343 +oid sha256:f0f78001c8c8edb4bddc3d4c5ee7428d56ae313254158ad1eec49eced57f6a5b +size 4244148 diff --git a/tbb.spec b/tbb.spec index de014d4387fd6b0078cc3f260d8428ea24aba60b..1bf0134db02355e7ca1230811008df1b42520e41 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,6 +1,6 @@ Name: tbb -Version: 2022.0.0 -Release: 2 +Version: 2022.2.0 +Release: 1 Summary: Threading Building Blocks lets you easily write parallel C++ programs License: Apache-2.0 URL: http://threadingbuildingblocks.org/ @@ -12,8 +12,8 @@ Patch0: tbb-2021-Werror.patch Patch9000: bugfix-tbb-fix-__TBB_machine_fetchadd4-was-not-declared-on-.patch -BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip -BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python3-wheel +BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip ninja-build +BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python3-sphinx-design python3-wheel %description Threading Building Blocks (TBB) lets you easily write parallel C++ programs that @@ -63,17 +63,15 @@ for fil in $(grep -Frl %{_bindir}/env python); do done sed -e "s|'\(https://docs\.python\.org\)/': None|'python': ('\1/3', '%{_docdir}/python3-docs/html/objects.inv')|" \ - -i doc/conf.py doc/GSG/conf.py doc/main/conf.py + -i doc/conf.py %build export TBBROOT=$PWD export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{__cmake_builddir}/python/build," <<< %{python3_sitearch}) -%cmake \ +%cmake -G Ninja \ -DCMAKE_CXX_STANDARD=17 \ -DTBB4PY_BUILD:BOOL=ON \ - -DTBB_STRICT:BOOL=OFF \ - -DCMAKE_HWLOC_2_4_LIBRARY_PATH=%{_libdir}/libhwloc.so \ - -DCMAKE_HWLOC_2_4_INCLUDE_PATH=%{_includedir}/hwloc \ + -DTBB_STRICT:BOOL=OFF %cmake_build @@ -88,9 +86,9 @@ cd python %pyproject_build cd - -export BUILD_TYPE=oneapi -sphinx-build doc/GSG getting-started -sphinx-build doc/main html +pushd doc +make html +popd %install %cmake_install @@ -136,7 +134,7 @@ rm -fr %{buildroot}%{_datadir}/doc %{_libdir}/*.so %files help -%doc getting-started html +%doc build/html %files -n python3-tbb %doc python/README.md @@ -145,6 +143,9 @@ rm -fr %{buildroot}%{_datadir}/doc %{python3_sitearch}/__pycache__/TBB* %changelog +* Wed Jul 02 2025 Funda Wang - 2022.2.0-1 +- update to 2022.2.0 + * Mon Jun 23 2025 wangkai <13474090681@163.com> - 2022.0.0-2 - Fix package path error