From d5ee7fce50e4a88426ef8432ad0f7ee46c1fa5b5 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Nov 03 2011 21:41:18 +0000
Subject: Merge branch 'f16'


Conflicts:
	boost.spec

---

diff --git a/boost-1.47.0-tuple.patch b/boost-1.47.0-tuple.patch
new file mode 100644
index 0000000..a409cf8
--- /dev/null
+++ b/boost-1.47.0-tuple.patch
@@ -0,0 +1,11 @@
+Index: /trunk/boost/math/tools/tuple.hpp
+===================================================================
+--- /trunk/boost/math/tools/tuple.hpp	(revision 65320)
++++ /trunk/boost/math/tools/tuple.hpp	(revision 74891)
+@@ -32,5 +32,5 @@
+ #elif defined(BOOST_HAS_TR1_TUPLE)
+ 
+-#include <tuple>
++#include <boost/tr1/tuple.hpp>
+ 
+ namespace boost{ namespace math{
diff --git a/boost.spec b/boost.spec
index cca88b7..53fba77 100644
--- a/boost.spec
+++ b/boost.spec
@@ -28,7 +28,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.47.0
 %define version_enc 1_47_0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Boost and MIT and Python
 
 # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -93,6 +93,9 @@ Patch2: boost-1.47.0-signals-erase.patch
 # https://svn.boost.org/trac/boost/ticket/5731
 Patch3: boost-1.47.0-exceptions.patch
 
+# https://svn.boost.org/trac/boost/ticket/5934
+Patch4: boost-1.47.0-tuple.patch
+
 %bcond_with tests
 %bcond_with docs_generated
 
@@ -437,6 +440,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
 # Fixes
 %patch2 -p1
 %patch3 -p0
+%patch4 -p2
 
 %build
 # Support for building tests.
@@ -893,6 +897,10 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
 %{_bindir}/bjam
 
 %changelog
+* Thu Nov  3 2011 Petr Machata <pmachata@redhat.com> - 1.47.0-7
+- Use <boost/tr1/tuple> instead of C++11 header <tuple> in boost math.
+- Resolves: #751210
+
 * Fri Sep  9 2011 Petr Machata <pmachata@redhat.com> - 1.47.0-6
 - Rebuild for libicu soname bump
 - Hack /bin back to PATH after MPI module unload