From 7d6d0e7e28270c3a95ac56979128349b07a35c8a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 25 Nov 2017 13:33:59 -0700 Subject: [PATCH] Rebase to 2018 update 1. --- sources | 2 +- tbb.spec | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sources b/sources index d4e8f68..796be05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2017_U7.tar.gz) = 77fdd381eece8fb2fba4115af55d168e9d433bbdae3c21a53c35e7d5ed3397645fe75998ad10593b718f6959daaac05112401480cdb4fd2054f50b5f6f1a0df6 +SHA512 (2018_U1.tar.gz) = a975ab61b5eb0ca9b537f6836a61e8b5323fee5db04a9fafccd28dcf070caaf94c6772c482bdcdfe0e8769ab12fe7c6d2ce65ce4226052676c09e4c8d859250e diff --git a/tbb.spec b/tbb.spec index 90325c0..6850d38 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,5 +1,5 @@ -%global upver 2017 -%global uprel 7 +%global upver 2018 +%global uprel 1 %if 0%{?fedora} || 0%{?rhel} >= 8 %global with_python3 1 @@ -7,13 +7,13 @@ Name: tbb Summary: The Threading Building Blocks library abstracts low-level threading details -Version: %{upver}.%{uprel} -Release: 3%{?dist} +Version: %{upver}%{?uprel:.%{uprel}} +Release: 1%{?dist} License: ASL 2.0 Group: Development/Tools URL: http://threadingbuildingblocks.org/ -Source0: https://github.com/01org/tbb/archive/%{upver}_U%{uprel}.tar.gz +Source0: https://github.com/01org/tbb/archive/%{upver}%{?uprel:_U%{uprel}}.tar.gz # These three are downstream sources. Source6: tbb.pc Source7: tbbmalloc.pc @@ -235,21 +235,24 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst %endif %changelog +* Sat Nov 25 2017 Jerry James - 2018.1-1 +- Rebase to 2018 update 1 + * Thu Aug 03 2017 Fedora Release Engineering - 2017.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild * Thu Jul 27 2017 Fedora Release Engineering - 2017.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Thu Jun 8 2017 Jerry James - 2017.%{uprel}-1 +* Thu Jun 8 2017 Jerry James - 2017.7-1 - Rebase to 2017 update 7 - Use the license macro - Ship the new cmake files in -devel -* Tue May 16 2017 Jerry James - 2017.%{uprel}-1 +* Tue May 16 2017 Jerry James - 2017.6-1 - Rebase to 2017 update 6 -* Fri Mar 17 2017 Jerry James - 2017.5-1%{?dist} +* Fri Mar 17 2017 Jerry James - 2017.5-1 - Rebase to 2017 update 5 - Change version scheme again to match upstream's change - New source URL on github