Revert last change

boost-1.53.0-signals2-std_get_llvm.patch

@@ -0,0 +1,59 @@
+Index: /trunk/boost/signals2/detail/variadic_slot_invoker.hpp
+===================================================================
+--- /trunk/boost/signals2/detail/variadic_slot_invoker.hpp	(revision 78502)
++++ /trunk/boost/signals2/detail/variadic_slot_invoker.hpp	(revision 83041)
+@@ -16,4 +16,5 @@
+ #define BOOST_SIGNALS2_DETAIL_VARIADIC_SLOT_INVOKER_HPP
+ 
++#include <boost/mpl/size_t.hpp>
+ #include <boost/signals2/detail/variadic_arg_type.hpp>
+ 
+@@ -23,7 +24,9 @@
+ #include <boost/tuple/tuple.hpp>
+ #define BOOST_SIGNALS2_TUPLE boost::tuple
++#define BOOST_SIGNALS2_GET boost::get
+ #else
+ #include <tuple>
+ #define BOOST_SIGNALS2_TUPLE std::tuple
++#define BOOST_SIGNALS2_GET std::get
+ #endif
+ 
+@@ -71,8 +74,8 @@
+         typedef R result_type;
+ 
+-        template<typename Func, typename ... Args>
+-          R operator()(Func &func, BOOST_SIGNALS2_TUPLE<Args...> args) const
++        template<typename Func, typename ... Args, std::size_t N>
++        R operator()(Func &func, BOOST_SIGNALS2_TUPLE<Args...> args, mpl::size_t<N>) const
+         {
+-          typedef typename make_unsigned_meta_array<sizeof...(Args)>::type indices_type;
++          typedef typename make_unsigned_meta_array<N>::type indices_type;
+           typename Func::result_type *resolver = 0;
+           return m_invoke(resolver, func, indices_type(), args);
+@@ -82,10 +85,10 @@
+           R m_invoke(T *, Func &func, unsigned_meta_array<indices...>, BOOST_SIGNALS2_TUPLE<Args...> args) const
+         {
+-          return func(std::get<indices>(args)...);
++          return func(BOOST_SIGNALS2_GET<indices>(args)...);
+         }
+         template<typename Func, unsigned ... indices, typename ... Args>
+           R m_invoke(void *, Func &func, unsigned_meta_array<indices...>, BOOST_SIGNALS2_TUPLE<Args...> args) const
+         {
+-          func(std::get<indices>(args)...);
++          func(BOOST_SIGNALS2_GET<indices>(args)...);
+           return R();
+         }
+@@ -112,5 +115,5 @@
+           const void_type *) const
+         {
+-          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args);
++          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>());
+           return void_type();
+         }
+@@ -118,5 +121,5 @@
+           result_type m_invoke(const ConnectionBodyType &connectionBody, ...) const
+         {
+-          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args);
++          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>());
+         }
+         BOOST_SIGNALS2_TUPLE<Args& ...> _args;

boost-1.54.0-interprocess-atomic_cas32-ppc.patch

@@ -0,0 +1,14 @@
+diff -up boost_1_54_0/boost/interprocess/detail/atomic.hpp\~ boost_1_54_0/boost/interprocess/detail/atomic.hpp
+--- boost_1_54_0/boost/interprocess/detail/atomic.hpp~	2012-09-24 14:17:34.000000000 +0200
++++ boost_1_54_0/boost/interprocess/detail/atomic.hpp	2013-08-29 16:36:51.682606594 +0200
+@@ -213,7 +213,7 @@ inline boost::uint32_t atomic_cas32
+                  "bne-   1b\n\t"
+                  "2:"
+                  : "=&r"(prev)
+-                 : "b" (mem), "r"(cmp), "r" (with)
++                 : "b" (mem), "r" (with), "r" (cmp)
+                  : "cc", "memory");
+    return prev;
+ }
+
+Diff finished.  Thu Aug 29 16:36:55 2013

boost-1.54.0-pool-max_chunks_shadow.patch

@@ -0,0 +1,14 @@
+diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp
+--- ./boost/pool/pool.hpp~	2013-08-21 17:49:56.023296922 +0200
++++ ./boost/pool/pool.hpp	2013-08-22 11:38:01.133912638 +0200
+@@ -361,9 +361,7 @@ class pool: protected simple_segregated_
+     { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
+       size_type partition_size = alloc_size();
+       size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
+-      size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+-    
+-      return max_chunks;
++      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+     }
+ 
+     static void * & nextof(void * const ptr)

boost-1.54.0-pool-test_linking.patch

@@ -0,0 +1,31 @@
+diff -up ./libs/pool/test/Jamfile.v2~ ./libs/pool/test/Jamfile.v2
+--- ./libs/pool/test/Jamfile.v2~	2011-08-02 19:04:07.000000000 +0200
++++ ./libs/pool/test/Jamfile.v2	2013-08-22 11:48:34.907287286 +0200
+@@ -24,17 +24,17 @@ run valgrind_config_check.cpp : : : <tes
+ explicit valgrind_config_check ;
+ 
+ test-suite pool :
+-    [ run test_simple_seg_storage.cpp ]
+-    [ run test_pool_alloc.cpp ]
+-    [ run pool_msvc_compiler_bug_test.cpp ]
+-    [ run test_msvc_mem_leak_detect.cpp ]
+-    [ run test_bug_3349.cpp ]
+-    [ run test_bug_4960.cpp ]
+-    [ run test_bug_1252.cpp ]
+-    [ run test_bug_2696.cpp ]
+-    [ run test_bug_5526.cpp ]
++    [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
++    [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
+     [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ]
+-    [ run  ../example/time_pool_alloc.cpp ]
++    [ run  ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
+     [ compile test_poisoned_macros.cpp ]
+ 
+ #

boost-1.54.0-thread-cond_variable_shadow.patch

@@ -0,0 +1,104 @@
+diff -up ./boost/thread/pthread/condition_variable.hpp~ ./boost/thread/pthread/condition_variable.hpp
+--- ./boost/thread/pthread/condition_variable.hpp~	2013-01-14 18:17:50.000000000 +0100
++++ ./boost/thread/pthread/condition_variable.hpp	2013-08-22 11:47:48.330596804 +0200
+@@ -200,15 +200,15 @@ namespace boost
+ 
+ #if defined BOOST_THREAD_USES_DATETIME
+         template<typename lock_type>
+-        bool timed_wait(lock_type& m,boost::system_time const& wait_until)
++        bool timed_wait(lock_type& m,boost::system_time const& a_wait_until)
+         {
+-            struct timespec const timeout=detail::to_timespec(wait_until);
++            struct timespec const timeout=detail::to_timespec(a_wait_until);
+             return do_wait_until(m, timeout);
+         }
+         template<typename lock_type>
+-        bool timed_wait(lock_type& m,xtime const& wait_until)
++        bool timed_wait(lock_type& m,xtime const& a_wait_until)
+         {
+-            return timed_wait(m,system_time(wait_until));
++            return timed_wait(m,system_time(a_wait_until));
+         }
+ 
+         template<typename lock_type,typename duration_type>
+@@ -218,20 +218,20 @@ namespace boost
+         }
+ 
+         template<typename lock_type,typename predicate_type>
+-        bool timed_wait(lock_type& m,boost::system_time const& wait_until,predicate_type pred)
++        bool timed_wait(lock_type& m,boost::system_time const& a_wait_until,predicate_type pred)
+         {
+             while (!pred())
+             {
+-                if(!timed_wait(m, wait_until))
++                if(!timed_wait(m, a_wait_until))
+                     return pred();
+             }
+             return true;
+         }
+ 
+         template<typename lock_type,typename predicate_type>
+-        bool timed_wait(lock_type& m,xtime const& wait_until,predicate_type pred)
++        bool timed_wait(lock_type& m,xtime const& a_wait_until,predicate_type pred)
+         {
+-            return timed_wait(m,system_time(wait_until),pred);
++            return timed_wait(m,system_time(a_wait_until),pred);
+         }
+ 
+         template<typename lock_type,typename duration_type,typename predicate_type>
+diff -up ./boost/thread/pthread/condition_variable_fwd.hpp~ ./boost/thread/pthread/condition_variable_fwd.hpp
+--- ./boost/thread/pthread/condition_variable_fwd.hpp~	2013-01-14 18:17:50.000000000 +0100
++++ ./boost/thread/pthread/condition_variable_fwd.hpp	2013-08-22 11:46:26.579385366 +0200
+@@ -98,21 +98,21 @@ namespace boost
+ #if defined BOOST_THREAD_USES_DATETIME
+         inline bool timed_wait(
+             unique_lock<mutex>& m,
+-            boost::system_time const& wait_until)
++            boost::system_time const& a_wait_until)
+         {
+ #if defined BOOST_THREAD_WAIT_BUG
+-            struct timespec const timeout=detail::to_timespec(wait_until + BOOST_THREAD_WAIT_BUG);
++            struct timespec const timeout=detail::to_timespec(a_wait_until + BOOST_THREAD_WAIT_BUG);
+             return do_wait_until(m, timeout);
+ #else
+-            struct timespec const timeout=detail::to_timespec(wait_until);
++            struct timespec const timeout=detail::to_timespec(a_wait_until);
+             return do_wait_until(m, timeout);
+ #endif
+         }
+         bool timed_wait(
+             unique_lock<mutex>& m,
+-            xtime const& wait_until)
++            xtime const& a_wait_until)
+         {
+-            return timed_wait(m,system_time(wait_until));
++            return timed_wait(m,system_time(a_wait_until));
+         }
+ 
+         template<typename duration_type>
+@@ -126,11 +126,11 @@ namespace boost
+         template<typename predicate_type>
+         bool timed_wait(
+             unique_lock<mutex>& m,
+-            boost::system_time const& wait_until,predicate_type pred)
++            boost::system_time const& a_wait_until,predicate_type pred)
+         {
+             while (!pred())
+             {
+-                if(!timed_wait(m, wait_until))
++                if(!timed_wait(m, a_wait_until))
+                     return pred();
+             }
+             return true;
+@@ -139,9 +139,9 @@ namespace boost
+         template<typename predicate_type>
+         bool timed_wait(
+             unique_lock<mutex>& m,
+-            xtime const& wait_until,predicate_type pred)
++            xtime const& a_wait_until,predicate_type pred)
+         {
+-            return timed_wait(m,system_time(wait_until),pred);
++            return timed_wait(m,system_time(a_wait_until),pred);
+         }
+ 
+         template<typename duration_type,typename predicate_type>

boost.spec

@@ -6,9 +6,9 @@
 %define boost_examplesdir __tmp_examplesdir
 
 %ifarch %{arm}
-  %bcond_with mpich2
+  %bcond_with mpich
 %else
-  %bcond_without mpich2
+  %bcond_without mpich
 %endif
 
 %ifarch s390 s390x %{arm}
@@ -34,7 +34,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.53.0
 %define version_enc 1_53_0
-Release: 8%{?dist}
+Release: 14%{?dist}
 License: Boost and MIT and Python
 
 %define toplev_dirname %{name}_%{version_enc}
@@ -189,6 +189,23 @@ Patch48: boost-1.54.0-mpi-unused_typedef.patch
 # https://svn.boost.org/trac/boost/ticket/8888
 Patch49: boost-1.54.0-python-unused_typedef.patch
 
+# https://svn.boost.org/trac/boost/ticket/8102
+# https://bugzilla.redhat.com/show_bug.cgi?id=999320
+Patch50: boost-1.53.0-signals2-std_get_llvm.patch
+
+# https://svn.boost.org/trac/boost/ticket/9038
+Patch51: boost-1.54.0-pool-test_linking.patch
+
+# https://svn.boost.org/trac/boost/ticket/9037
+Patch52: boost-1.54.0-thread-cond_variable_shadow.patch
+
+# This was already fixed upstream, so no tracking bug.
+Patch53: boost-1.54.0-pool-max_chunks_shadow.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1002578
+# https://svn.boost.org/trac/boost/ticket/9065
+Patch55: boost-1.54.0-interprocess-atomic_cas32-ppc.patch
+
 %bcond_with tests
 %bcond_with docs_generated
 
@@ -216,6 +233,7 @@ variables.
 %package chrono
 Summary: Run-Time component of boost chrono library
 Group: System Environment/Libraries
+Requires: boost-system = %{version}-%{release}
 
 %description chrono
 
@@ -244,6 +262,7 @@ on generic programming concepts.
 %package filesystem
 Summary: Run-Time component of boost filesystem library
 Group: System Environment/Libraries
+Requires: boost-system = %{version}-%{release}
 
 %description filesystem
 
@@ -254,6 +273,7 @@ directories.
 %package graph
 Summary: Run-Time component of boost graph library
 Group: System Environment/Libraries
+Requires: boost-regex = %{version}-%{release}
 
 %description graph
 
@@ -273,6 +293,9 @@ stream buffers and i/o filters.
 %package locale
 Summary: Run-Time component of boost locale library
 Group: System Environment/Libraries
+Requires: boost-chrono = %{version}-%{release}
+Requires: boost-system = %{version}-%{release}
+Requires: boost-thread = %{version}-%{release}
 
 %description locale
 
@@ -390,6 +413,7 @@ program execution monitoring.
 %package thread
 Summary: Run-Time component of boost thread library
 Group: System Environment/Libraries
+Requires: boost-system = %{version}-%{release}
 
 %description thread
 
@@ -401,6 +425,8 @@ data specific to individual threads.
 %package timer
 Summary: Run-Time component of boost timer library
 Group: System Environment/Libraries
+Requires: boost-chrono = %{version}-%{release}
+Requires: boost-system = %{version}-%{release}
 
 %description timer
 
@@ -411,6 +437,11 @@ with as little as one #include and one additional line of code.
 %package wave
 Summary: Run-Time component of boost C99/C++ pre-processing library
 Group: System Environment/Libraries
+Requires: boost-chrono = %{version}-%{release}
+Requires: boost-date-time = %{version}-%{release}
+Requires: boost-filesystem = %{version}-%{release}
+Requires: boost-system = %{version}-%{release}
+Requires: boost-thread = %{version}-%{release}
 
 %description wave
 
@@ -424,6 +455,14 @@ Group: Development/Libraries
 Requires: boost = %{version}-%{release}
 Provides: boost-python-devel = %{version}-%{release}
 
+# Odeint was shipped in Fedora 18, but later became part of Boost.
+# Note we also obsolete odeint-doc down there.
+# https://bugzilla.redhat.com/show_bug.cgi?id=892850
+Provides: odeint = 2.2-4
+Obsoletes: odeint < 2.2-4
+Provides: odeint-devel = 2.2-4
+Obsoletes: odeint-devel < 2.2-4
+
 %description devel
 Headers and shared object symbolic links for the Boost C++ libraries.
 
@@ -445,6 +484,10 @@ BuildArch: noarch
 %endif
 Provides: boost-python-docs = %{version}-%{release}
 
+# See the description above.
+Provides: odeint-doc = 2.2-4
+Obsoletes: odeint-doc < 2.2-4
+
 %description doc
 This package contains the documentation in the HTML format of the Boost C++
 libraries. The documentation provides the same content as that on the Boost
@@ -469,6 +512,7 @@ Summary: Run-Time component of Boost.MPI library
 Group: System Environment/Libraries
 Requires: openmpi
 BuildRequires: openmpi-devel
+Requires: boost-serialization = %{version}-%{release}
 
 %description openmpi
 
@@ -492,6 +536,8 @@ API over the OpenMPI implementation of MPI.
 Summary: Python run-time component of Boost.MPI library
 Group: System Environment/Libraries
 Requires: boost-openmpi = %{version}-%{release}
+Requires: boost-python = %{version}-%{release}
+Requires: boost-serialization = %{version}-%{release}
 
 %description openmpi-python
 
@@ -502,6 +548,7 @@ API over the OpenMPI implementation of MPI.
 Summary: Run-Time component of parallel boost graph library
 Group: System Environment/Libraries
 Requires: boost-openmpi = %{version}-%{release}
+Requires: boost-serialization = %{version}-%{release}
 
 %description graph-openmpi
 
@@ -513,52 +560,64 @@ back-end to do the parallel work.
 %endif
 
 
-%if %{with mpich2}
+%if %{with mpich}
 
-%package mpich2
+%package mpich
 Summary: Run-Time component of Boost.MPI library
 Group: System Environment/Libraries
-Requires: mpich2
-BuildRequires: mpich2-devel
+Requires: mpich
+BuildRequires: mpich-devel
+Requires: boost-serialization = %{version}-%{release}
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 1.53.0-9
 
-%description mpich2
+%description mpich
 
-Run-Time support for Boost.MPI-MPICH2, a library providing a clean C++
-API over the MPICH2 implementation of MPI.
+Run-Time support for Boost.MPI-MPICH, a library providing a clean C++
+API over the MPICH implementation of MPI.
 
-%package mpich2-devel
+%package mpich-devel
 Summary: Shared library symbolic links for Boost.MPI
 Group: System Environment/Libraries
 Requires: boost-devel = %{version}-%{release}
-Requires: boost-mpich2 = %{version}-%{release}
-Requires: boost-mpich2-python = %{version}-%{release}
-Requires: boost-graph-mpich2 = %{version}-%{release}
+Requires: boost-mpich = %{version}-%{release}
+Requires: boost-mpich-python = %{version}-%{release}
+Requires: boost-graph-mpich = %{version}-%{release}
+Provides: %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes: %{name}-mpich2-devel < 1.53.0-9
 
-%description mpich2-devel
+%description mpich-devel
 
-Devel package for Boost.MPI-MPICH2, a library providing a clean C++
-API over the MPICH2 implementation of MPI.
+Devel package for Boost.MPI-MPICH, a library providing a clean C++
+API over the MPICH implementation of MPI.
 
-%package mpich2-python
+%package mpich-python
 Summary: Python run-time component of Boost.MPI library
 Group: System Environment/Libraries
-Requires: boost-mpich2 = %{version}-%{release}
+Requires: boost-mpich = %{version}-%{release}
+Requires: boost-python = %{version}-%{release}
+Requires: boost-serialization = %{version}-%{release}
+Provides: %{name}-mpich2-python = %{version}-%{release}
+Obsoletes: %{name}-mpich2-python < 1.53.0-9
 
-%description mpich2-python
+%description mpich-python
 
-Python support for Boost.MPI-MPICH2, a library providing a clean C++
-API over the MPICH2 implementation of MPI.
+Python support for Boost.MPI-MPICH, a library providing a clean C++
+API over the MPICH implementation of MPI.
 
-%package graph-mpich2
+%package graph-mpich
 Summary: Run-Time component of parallel boost graph library
 Group: System Environment/Libraries
-Requires: boost-mpich2 = %{version}-%{release}
+Requires: boost-mpich = %{version}-%{release}
+Requires: boost-serialization = %{version}-%{release}
+Provides: %{name}-graph-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-graph-mpich2 < 1.53.0-9
 
-%description graph-mpich2
+%description graph-mpich
 
 Run-Time support for the Parallel BGL graph library.  The interface and
 graph components are generic, in the same sense as the the Standard
-Template Library (STL).  This libraries in this package use MPICH2
+Template Library (STL).  This libraries in this package use MPICH
 back-end to do the parallel work.
 
 %endif
@@ -626,6 +685,11 @@ a number of significant features and is now developed independently
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p2
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch55 -p1
 
 # At least python2_version needs to be a macro so that it's visible in
 # %%install as well.
@@ -680,7 +744,7 @@ echo ============================= build serial ==================
 
 # Build MPI parts of Boost with OpenMPI support
 
-%if %{with openmpi} || %{with mpich2}
+%if %{with openmpi} || %{with mpich}
 # First, purge all modules so that user environment doesn't conflict
 # with the build.
 module purge ||:
@@ -701,15 +765,15 @@ echo ============================= build $MPI_COMPILER ==================
 export PATH=/bin${PATH:+:}$PATH
 %endif
 
-# Build MPI parts of Boost with MPICH2 support
-%if %{with mpich2}
-%{_mpich2_load}
+# Build MPI parts of Boost with MPICH support
+%if %{with mpich}
+%{_mpich_load}
 echo ============================= build $MPI_COMPILER ==================
 ./b2 -d+2 -q %{?_smp_mflags} --layout=tagged \
 	--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
 	variant=release threading=multi debug-symbols=on pch=off \
 	python=%{python2_version} stage
-%{_mpich2_unload}
+%{_mpich_unload}
 export PATH=/bin${PATH:+:}$PATH
 %endif
 
@@ -726,7 +790,7 @@ rm -rf $RPM_BUILD_ROOT
 
 cd %{_builddir}/%{toplev_dirname}
 
-%if %{with openmpi} || %{with mpich2}
+%if %{with openmpi} || %{with mpich}
 # First, purge all modules so that user environment doesn't conflict
 # with the build.
 module purge ||:
@@ -748,8 +812,8 @@ rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
 export PATH=/bin${PATH:+:}$PATH
 %endif
 
-%if %{with mpich2}
-%{_mpich2_load}
+%if %{with mpich}
+%{_mpich_load}
 echo ============================= install $MPI_COMPILER ==================
 ./b2 -q %{?_smp_mflags} --layout=tagged \
 	--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
@@ -760,7 +824,7 @@ echo ============================= install $MPI_COMPILER ==================
 # Remove generic parts of boost that were built for dependencies.
 rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
 
-%{_mpich2_unload}
+%{_mpich_unload}
 export PATH=/bin${PATH:+:}$PATH
 %endif
 
@@ -1126,8 +1190,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %doc LICENSE_1_0.txt
 %{_libdir}/*.a
-%if %{with mpich2}
-%{_libdir}/mpich2/lib/*.a
+%if %{with mpich}
+%{_libdir}/mpich/lib/*.a
 %endif
 %if %{with openmpi}
 %{_libdir}/openmpi/lib/*.a
@@ -1159,29 +1223,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %endif
 
-# MPICH2 packages
-%if %{with mpich2}
+# MPICH packages
+%if %{with mpich}
 
-%files mpich2
+%files mpich
 %defattr(-, root, root, -)
 %doc LICENSE_1_0.txt
-%{_libdir}/mpich2/lib/libboost_mpi-mt.so.%{sonamever}
+%{_libdir}/mpich/lib/libboost_mpi-mt.so.%{sonamever}
 
-%files mpich2-devel
+%files mpich-devel
 %defattr(-, root, root, -)
 %doc LICENSE_1_0.txt
-%{_libdir}/mpich2/lib/libboost_*.so
+%{_libdir}/mpich/lib/libboost_*.so
 
-%files mpich2-python
+%files mpich-python
 %defattr(-, root, root, -)
 %doc LICENSE_1_0.txt
-%{_libdir}/mpich2/lib/libboost_mpi_python*.so.%{sonamever}
-%{_libdir}/mpich2/lib/mpi.so
+%{_libdir}/mpich/lib/libboost_mpi_python*.so.%{sonamever}
+%{_libdir}/mpich/lib/mpi.so
 
-%files graph-mpich2
+%files graph-mpich
 %defattr(-, root, root, -)
 %doc LICENSE_1_0.txt
-%{_libdir}/mpich2/lib/libboost_graph_parallel-mt.so.%{sonamever}
+%{_libdir}/mpich/lib/libboost_graph_parallel-mt.so.%{sonamever}
 
 %endif
 
@@ -1197,6 +1261,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Thu Aug 29 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-14
+- Fix atomic_cas32 (thanks Jaroslav Škarvada for figuring out where
+  the problem is) (boost-1.54.0-interprocess-atomic_cas32-ppc.patch)
+
+* Fri Aug 23 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-13
+- Fix compilation of Boost.Pool test cases
+  (boost-1.54.0-pool-test_linking.patch)
+- Fix -Wshadow warnings in Boost.Pool
+  (boost-1.54.0-pool-max_chunks_shadow.patch)
+ -Wshadow warnings in Boost.Thread
+  (boost-1.54.0-thread-cond_variable_shadow.patch)
+
+* Wed Aug 21 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-12
+- Fix boost::signals2::signal on LLVM
+  (boost-1.53.0-signals2-std_get_llvm.patch)
+
+* Fri Jul 26 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-11
+- Add Obsoletes for odeint (bug 892850)
+
+* Thu Jul 25 2013 Deji Akingunola <dakingun@gmail.com> - 1.53.0-10
+- Add Provides and Obsoletes for the mpich2->mpich renames
+
+* Wed Jul 24 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-9
+- Add explicit dependencies between some of the boost sub-packages
+- MPICH2 became MPICH -- rename subpackages, dependencies and
+  conditionals.
+
 * Fri Jul 19 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-8
 - Install supporting files (images etc.) for documentation
   (courtesy Marcel Metz, bug 985593)