Rebase to 2018 update 4.

This commit is contained in:
Jerry James 2018-05-31 21:20:43 -06:00
parent 79a08e6cc7
commit e6bc89d1b2
2 changed files with 8 additions and 10 deletions

View File

@ -1 +1 @@
SHA512 (2018_U2.tar.gz) = a94b55bcabec47424be1c2d4b7bf3502a545bc714250a260e152b00431420094dbab64c0355bd0004ee9ad10d85c7b920969bf4b6d9a30b3697c7c5202518841
SHA512 (2018_U4.tar.gz) = 1903bf68f428f99e1d309f4d094c579f23504967c42a95d033fa7e9eeb15bd9da239a6670cb5ad13a08c29509dbffe4eec9117db109a86a1444f947865bb9d89

View File

@ -1,5 +1,5 @@
%global upver 2018
%global uprel 2
%global uprel 4
%if 0%{?fedora} || 0%{?rhel} >= 8
%global with_python3 1
@ -8,7 +8,7 @@
Name: tbb
Summary: The Threading Building Blocks library abstracts low-level threading details
Version: %{upver}%{?uprel:.%{uprel}}
Release: 5%{?dist}
Release: 1%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://threadingbuildingblocks.org/
@ -93,10 +93,7 @@ Python 3 TBB module.
%prep
%setup -q -n %{name}-%{upver}_U%{uprel}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autosetup -p1 -n %{name}-%{upver}_U%{uprel}
# For repeatable builds, don't query the hostname or architecture
sed -i 's/"`hostname -s`" ("`uname -m`"/fedorabuild (%{_arch}/' \
@ -232,9 +229,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake
cp -a cmake $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}
rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets libs
%files
%doc doc/Release_Notes.txt README.md
@ -271,6 +266,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst
%endif
%changelog
* Thu May 31 2018 Jerry James <loganjerry@gmail.com> - 2018.4-1
- Rebase to 2018 update 4
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild