From 11f3ddff599ae31b94e52cb7051f99033181a778 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 22 Feb 2021 19:10:16 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tbb.git#a4b9df0c98beaaf2dd817da4bb5a43cd9d2c40ba --- tbb.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tbb.spec b/tbb.spec index 8a258f9..532cdba 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,7 +1,7 @@ Name: tbb Summary: The Threading Building Blocks library abstracts low-level threading details Version: 2020.3 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: http://threadingbuildingblocks.org/ @@ -168,10 +168,11 @@ ln -s libirml.so.1 $RPM_BUILD_ROOT%{_libdir}/libirml.so popd # Install the cmake files -mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake -cmake -DTBB_ROOT=$RPM_BUILD_ROOT%{_prefix} -DTBB_OS=Linux \ - -P cmake/tbb_config_generator.cmake -mv $RPM_BUILD_ROOT%{_prefix}/cmake $RPM_BUILD_ROOT%{_libdir}/cmake/TBB +cmake \ + -DINSTALL_DIR=$RPM_BUILD_ROOT%{_libdir}/cmake/TBB \ + -DSYSTEM_NAME=Linux \ + -DLIB_REL_PATH=../.. \ + -P cmake/tbb_config_installer.cmake %files %doc doc/Release_Notes.txt README.md @@ -200,6 +201,9 @@ mv $RPM_BUILD_ROOT%{_prefix}/cmake $RPM_BUILD_ROOT%{_libdir}/cmake/TBB %{python3_sitearch}/__pycache__/TBB* %changelog +* Mon Feb 22 2021 Jerry James - 2020.3-5 +- Fix cmake file installation some more (bz 1930389) + * Thu Feb 18 2021 Jerry James - 2020.3-4 - Fix cmake file installation (bz 1930389) - Allow use of RTM instructions when available