rpms/tbb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Import from CS git

Browse Source
This commit is contained in:
eabdullin 2025-02-10 11:50:09 +00:00
parent dde46ba087
commit bf003e286a
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SPECS/tbb.spec
View File

@ -4,7 +4,7 @@
Name: tbb Name: tbb
Summary: The Threading Building Blocks library abstracts low-level threading details Summary: The Threading Building Blocks library abstracts low-level threading details
Version: %{upver}%{?uprel:.%{uprel}} Version: %{upver}%{?uprel:.%{uprel}}
Release: 9%{?dist} Release: 10%{?dist}.1
License: ASL 2.0 License: ASL 2.0
Group: Development/Tools Group: Development/Tools
URL: http://threadingbuildingblocks.org/ URL: http://threadingbuildingblocks.org/
@ -82,10 +82,9 @@ Blocks (TBB) C++ libraries.
%package doc %package doc
Summary: The Threading Building Blocks documentation Summary: The Threading Building Blocks documentation
Group: Documentation Group: Documentation
Provides: bundled(jquery)
%description doc %description doc
PDF documentation for the user of the Threading Building Block (TBB) HTML documentation for the user of the Threading Building Block (TBB)
C++ library. C++ library.
%if %{with python2} %if %{with python2}
@ -150,11 +149,15 @@ cp -a python python2
cp -a python python3 cp -a python python3
sed -i 's,python,python3,g' python3/Makefile python3/rml/Makefile sed -i 's,python,python3,g' python3/Makefile python3/rml/Makefile
sed -i 's,python2,python3,' python3/TBB.py python3/tbb/__*.py sed -i 's,python2,python3,' python3/TBB.py python3/tbb/__*.py
%endif
# Invoke Python with the %%{__python3} executable instead of hardcoded python3 # Invoke Python with the %%{__python3} executable instead of hardcoded python3
sed -i 's,PY_SETUP=python3,PY_SETUP=%{__python3},g' python3/Makefile sed -i 's,PY_SETUP=python3,PY_SETUP=%{__python3},g' python3/Makefile
sed -i 's,python3 -m tbb test,%{__python3} -m tbb test,g' python3/Makefile sed -i 's,python3 -m tbb test,%{__python3} -m tbb test,g' python3/Makefile
%endif
# Remove jQuery
rm doc/html/jquery.js
find doc/html -name '*.html' | xargs sed -i '/<script type="text.javascript" src="jquery.js"><.script>/d'
%build %build
%ifarch %{ix86} %ifarch %{ix86}
@ -246,7 +249,7 @@ cp -p src/rml/include/*.h $RPM_BUILD_ROOT%{_includedir}/rml
# Python 2 install # Python 2 install
%if %{with python2} %if %{with python2}
. build/obj_release/tbbvars.sh . build/obj_release/tbbvars.sh
pushd python pushd python2
%py2_install %py2_install
chmod a+x $RPM_BUILD_ROOT%{python2_sitearch}/TBB.py chmod a+x $RPM_BUILD_ROOT%{python2_sitearch}/TBB.py
chmod a+x $RPM_BUILD_ROOT%{python2_sitearch}/tbb/__*.py chmod a+x $RPM_BUILD_ROOT%{python2_sitearch}/tbb/__*.py
@ -312,6 +315,18 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst
%endif %endif
%changelog %changelog
* Tue Feb 04 2025 Jonathan Wakely <jwakely@redhat.com> - 2018.2-10.1
- Remove jQuery from Doxygen files (RHEL-77669)
* Wed Feb 03 2021 Thomas Rodgers <trodgers@redhat.com> - 2018.2-10
- Apply patches from (BZ #1907561)
- Bump release
* Sun Dec 20 2020 Owen Taylor <otaylor@redhat.com> - 2018.2-9
- Fix build directory referenced in python2 build
- Move some python3 code that escaped back into a conditional
(BZ #1907561)
* Tue Nov 13 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018.2-9 * Tue Nov 13 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018.2-9
- Require the correct version of tbb for python2-tbb and python3-tbb. - Require the correct version of tbb for python2-tbb and python3-tbb.
(BZ #1638041) (BZ #1638041)