diff --git a/sources b/sources index 259db9d..52ddbb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tbb-2019_U7.tar.gz) = d1dd29d6b0276deb71e8621cd831817d7098cbd1f88586e8ed706118c0b7d9143c748dd05bf3797f4ae78411ae2da92b7a15a84f7ea6e3da6fcdd4e36db7be4a +SHA512 (tbb-2019_U8.tar.gz) = 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8 diff --git a/tbb.spec b/tbb.spec index 453ba5d..fd46f2d 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,5 +1,5 @@ %global upver 2019 -%global uprel 7 +%global uprel 8 %global upfullver %{upver}%{?uprel:_U%{uprel}} Name: tbb @@ -86,13 +86,6 @@ sed -i 's,env python,python3,' python/TBB.py python/tbb/__*.py # Remove shebang from files that don't need it sed -i '/^#!/d' python/tbb/{pool,test}.py -# Fix libdir on 64-bit systems -if [ "%{_libdir}" != "%{_prefix}/lib" ]; then - sed -i.orig 's/"lib"/"%{_lib}"/' cmake/TBBMakeConfig.cmake - touch -r cmake/TBBMakeConfig.cmake.orig cmake/TBBMakeConfig.cmake - rm cmake/TBBMakeConfig.cmake.orig -fi - %build make %{?_smp_mflags} tbb_build_prefix=obj stdver=c++14 \ CXXFLAGS="$RPM_OPT_FLAGS" @@ -187,6 +180,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst %{python3_sitearch}/__pycache__/TBB* %changelog +* Sat Jun 8 2019 Jerry James - 2019.8-1 +- Rebase to 2019 update 8 + * Thu May 23 2019 Jerry James - 2019.7-1 - Rebase to 2019 update 7