Rebase to 4.0

- CHANGES.txt is now tracked in the git repo

.gitignore

@@ -4,5 +4,5 @@ Reference.pdf
 Getting_Started.pdf
 /tbb30_20110419oss_src.tgz
 /Design_Patterns.pdf
-/CHANGES.txt
 tbb*/
+/tbb40_20110809oss_src.tgz

sources

@@ -1,6 +1,5 @@
-c7d1712d9e3ff76d9037aff5fcd67a17  tbb30_20110419oss_src.tgz
-3378f28664adc82d20bccbe35ea4fbfb  Design_Patterns.pdf
-2d56ac8475941c81f004359ab75e4120  Getting_Started.pdf
-bb609bdd5dcb4b0a8bc0709e3bef622e  Reference.pdf
-30239687f75afd96ae1ad62e380633b9  Tutorial.pdf
-62d5169d83f256b502c6a7d0729a68e9  CHANGES.txt
+c3c66663c10261ff03d1b071ab74e659  tbb40_20110809oss_src.tgz
+683109a2b732ecd56185d9019667718f  Design_Patterns.pdf
+907eed2e81e0d29a93848a26e0fbfa5d  Getting_Started.pdf
+131f0f2ae4311794dfa37b7a9172c54e  Reference.pdf
+74fca4778a2c624631c157b07beab7ec  Tutorial.pdf

tbb-4.0-mfence.patch

@@ -1,8 +1,8 @@
-diff -up tbb30_20110419oss/include/tbb/machine/linux_ia32.h\~ tbb30_20110419oss/include/tbb/machine/linux_ia32.h
---- tbb30_20110419oss/include/tbb/machine/linux_ia32.h~	2011-04-19 13:48:59.000000000 +0200
-+++ tbb30_20110419oss/include/tbb/machine/linux_ia32.h	2011-07-26 16:09:19.986615628 +0200
-@@ -40,7 +40,14 @@
- #define __TBB_control_consistency_helper()
+diff -up tbb40_20110809oss/include/tbb/machine/linux_ia32.h\~ tbb40_20110809oss/include/tbb/machine/linux_ia32.h
+--- tbb40_20110809oss/include/tbb/machine/linux_ia32.h~	2011-08-24 15:51:56.000000000 +0200
++++ tbb40_20110809oss/include/tbb/machine/linux_ia32.h	2011-10-18 15:04:01.994271994 +0200
+@@ -42,7 +42,14 @@
+ #define __TBB_control_consistency_helper() __TBB_compiler_fence()
  #define __TBB_acquire_consistency_helper() __TBB_compiler_fence()
  #define __TBB_release_consistency_helper() __TBB_compiler_fence()
 -#define __TBB_full_memory_fence()          __asm__ __volatile__("mfence": : :"memory")
@@ -18,4 +18,4 @@ diff -up tbb30_20110419oss/include/tbb/machine/linux_ia32.h\~ tbb30_20110419oss/
  #if __TBB_ICC_ASM_VOLATILE_BROKEN
  #define __TBB_VOLATILE
 
-Diff finished.  Tue Jul 26 16:09:26 2011
+Diff finished.  Tue Oct 18 15:04:09 2011

tbb.spec

@@ -1,5 +1,5 @@
-%define releasedate 20110419
-%define major 3
+%define releasedate 20110809
+%define major 4
 %define minor 0
 %define dotver %{major}.%{minor}
 %define sourcebasename tbb%{major}%{minor}_%{releasedate}oss
@@ -12,7 +12,7 @@ Release: 1.%{releasedate}%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 URL: http://threadingbuildingblocks.org/
-Source0: http://threadingbuildingblocks.org/uploads/76/169/3.0%%20update%%206/tbb30_20110419oss_src.tgz
+Source0: http://threadingbuildingblocks.org/uploads/77/175/4.0/tbb40_20110809oss_src.tgz
 
 # Upstream regularly replaces the "Latest" documentation with what's
 # actually Latest at that point.  These sources may no longer match
@@ -30,7 +30,7 @@ Source4: %{docurl}/%{source_4}
 Source5: %{docurl}/%{source_5}
 
 Patch1: tbb-3.0-cxxflags.patch
-Patch2: tbb-3.0-mfence.patch
+Patch2: tbb-4.0-mfence.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libstdc++-devel
 # We need "arch" and "hostname" binaries:
@@ -122,6 +122,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{source_5}
 
 %changelog
+* Tue Oct 18 2011 Petr Machata <pmachata@redhat.com> - 4.0-1.20110809
+- Rebase to 4.0
+  - Port the mfence patch
+  - Refresh the documentation bundle
+
 * Tue Jul 26 2011 Petr Machata <pmachata@redhat.com> - 3.0-1.20110419
 - Rebase to 3.0-r6
   - Port both patches