[tbb] Rebase to TBB 4.1 update 3

[Petr Machata]

commit 7cc476a8d7d025400eacd20b9f946aed66a16a46
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed May 22 15:32:02 2013 +0200

    Rebase to TBB 4.1 update 3

 .gitignore             |    3 +++
 sources                |    1 +
 tbb-3.0-cxxflags.patch |    8 ++++----
 tbb-4.0-cas.patch      |   16 ----------------
 tbb.spec               |   43 +++++++++++--------------------------------
 5 files changed, 19 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87c774b..1f23f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ Getting_Started.pdf
 tbb*/
 /tbb40_20110809oss_src.tgz
 /tbb40_20120408oss_src.tgz
+*.rpm
+/tbb41_20130314oss_src.tgz
+.*.log
diff --git a/sources b/sources
index 587a6f6..0bace97 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@
 56f3f5407481402e7653e57525f2c79b  Reference.pdf
 08d5cbf5d6ba946784aa578b03586c5e  Tutorial.pdf
 734b356da7fe0ed308741f3e6018251e  tbb40_20120408oss_src.tgz
+ed4af7ccfa122f16cf9920b241633a3a  tbb41_20130314oss_src.tgz
diff --git a/tbb-3.0-cxxflags.patch b/tbb-3.0-cxxflags.patch
index ab50b17..71dc4af 100644
--- a/tbb-3.0-cxxflags.patch
+++ b/tbb-3.0-cxxflags.patch
@@ -1,12 +1,12 @@
 diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.gcc.inc
 --- tbb30_20110419oss/build/linux.gcc.inc~	2011-04-19 13:48:58.000000000 +0200
 +++ tbb30_20110419oss/build/linux.gcc.inc	2011-07-26 14:02:48.482006056 +0200
-@@ -51,10 +51,10 @@ C_FLAGS = $(CPLUS_FLAGS)
+@@ -59,10 +59,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
+ endif
  
- ITT_NOTIFY = -DDO_ITT_NOTIFY
  ifeq ($(cfg), release)
 -        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -O2 -DUSE_PTHREAD
++        CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
  endif
  ifeq ($(cfg), debug)
 -        CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
@@ -15,4 +15,4 @@ diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.g
  
  ifneq (00,$(lambdas)$(cpp0x))
 
-Diff finished.  Tue Jul 26 14:02:54 2011
+Diff finished.  Tue Feb 26 13:00:13 2013
diff --git a/tbb.spec b/tbb.spec
index 7f526c4..ae86dd1 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -1,7 +1,7 @@
-%define releasedate 20120408
+%define releasedate 20130314
 %define major 4
-%define minor 0
-%define update 4
+%define minor 1
+%define update 3
 %define dotver %{major}.%{minor}
 %define sourcebasename tbb%{major}%{minor}_%{releasedate}oss
 
@@ -10,26 +10,11 @@
 Summary: The Threading Building Blocks library abstracts low-level threading details
 Name: tbb
 Version: %{dotver}
-Release: 7.%{releasedate}%{?dist}
+Release: 1.%{releasedate}%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 URL: http://threadingbuildingblocks.org/
-Source0: http://threadingbuildingblocks.org/uploads/77/185/4.0%%20update%%204/tbb40_20120408oss_src.tgz
-
-# Upstream regularly replaces the "Latest" documentation with what's
-# actually Latest at that point.  These sources may no longer match
-# what's uploaded anymore.
-%define docurl http://threadingbuildingblocks.org/uploads/81/91/Latest%%20Open%%20Source%%20Documentation/
-%define source_1 CHANGES.txt
-%define source_2 Getting_Started.pdf
-%define source_3 Reference.pdf
-%define source_4 Tutorial.pdf
-%define source_5 Design_Patterns.pdf
-Source1: %{docurl}/%{source_1}
-Source2: %{docurl}/%{source_2}
-Source3: %{docurl}/%{source_3}
-Source4: %{docurl}/%{source_4}
-Source5: %{docurl}/%{source_5}
+Source0: http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130314oss_src.tgz
 
 # These two are downstream sources.
 Source6: tbb.pc
@@ -39,13 +24,8 @@ Source8: tbbmalloc_proxy.pc
 Patch1: tbb-3.0-cxxflags.patch
 Patch2: tbb-4.0-mfence.patch
 
-# http://software.intel.com/en-us/forums/showthread.php?t=106373
-Patch3: tbb-4.0-cas.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libstdc++-devel
-# We need "arch" and "hostname" binaries:
-BuildRequires: util-linux net-tools
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 
 %description
@@ -83,7 +63,6 @@ C++ library.
 %setup -q -n %{sourcebasename}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" tbb_build_prefix=obj
@@ -91,7 +70,6 @@ for file in %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
     sed 's/_FEDORA_VERSION/%{major}.%{minor}.%{update}/' ${file} \
         > $(basename ${file})
 done
-cp -p "%{SOURCE1}" "%{SOURCE2}" "%{SOURCE3}" "%{SOURCE4}" "%{SOURCE5}" .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,19 +108,20 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{source_1}
+%doc CHANGES
 %{_includedir}/tbb
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{source_2}
-%doc %{source_3}
-%doc %{source_4}
-%doc %{source_5}
+%doc doc/Release_Notes.txt
+%doc doc/html
 
 %changelog
+* Wed May 22 2013 Petr Machata <pmachata at redhat.com> - 4.1-1.20130314
+- Rebase to 4.1 update 3
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-7.20120408
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild