diff --git a/boost.spec b/boost.spec
index 872818e..d8102fe 100644
--- a/boost.spec
+++ b/boost.spec
@@ -1,8 +1,39 @@
 %define packver %(echo "%{version}" | sed -e "s/\\\./_/g")
-%define libname %mklibname boost %{version}
-%define libnamedevel %mklibname boost -d
-%define libnamestaticdevel %mklibname boost -d -s
-%define coredevel %mklibname boost-core -d
+
+%define libatomic %mklibname boost_atomic %{version}
+%define libchrono %mklibname boost_chrono %{version}
+%define libcontext %mklibname boost_context %{version}
+%define libcoroutine %mklibname boost_coroutine %{version}
+%define libdatetime %mklibname boost_date_time %{version}
+%define libfilesystem %mklibname boost_filesystem %{version}
+%define libgraph %mklibname boost_graph %{version}
+%define libiostreams %mklibname boost_iostreams %{version}
+%define liblocale %mklibname boost_locale %{version}
+%define liblog %mklibname boost_log %{version}
+%define liblogsetup %mklibname boost_log_setup %{version}
+%define libmathc99 %mklibname boost_math_c99_ %{version}
+%define libmathc99f %mklibname boost_math_c99f %{version}
+%define libmathc99l %mklibname boost_math_c99l %{version}
+%define libmathtr1 %mklibname boost_math_tr1_ %{version}
+%define libmathtr1f %mklibname boost_math_tr1f %{version}
+%define libmathtr1l %mklibname boost_math_tr1l %{version}
+%define libprgexecmonitor %mklibname boost_prg_exec_monitor %{version}
+%define libprogramoptions %mklibname boost_program_options %{version}
+%define libpython %mklibname boost_python %{version}
+%define librandom %mklibname boost_random %{version}
+%define libregex %mklibname boost_regex %{version}
+%define libserialization %mklibname boost_serialization %{version}
+%define libsignals %mklibname boost_signals %{version}
+%define libsystem %mklibname boost_system %{version}
+%define libthread %mklibname boost_thread %{version}
+%define libtimer %mklibname boost_timer %{version}
+%define libunittestframework %mklibname boost_unit_test_framework %{version}
+%define libwave %mklibname boost_wave %{version}
+%define libwserialization %mklibname boost_wserialization %{version}
+
+%define devname %mklibname boost -d
+%define sdevname %mklibname boost -d -s
+
 %ifarch aarch64
 %bcond_with context
 %else
@@ -17,36 +48,29 @@
 Summary:	Portable C++ libraries
 Name:		boost
 Version:	1.55.0
-Release:	2
+Release:	3
 License:	Boost
 Group:		Development/C++
 Url:		http://boost.org/
 Source0:	http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2
 Source100:	%{name}.rpmlintrc
-
 # https://svn.boost.org/trac/boost/ticket/6150
-Patch4: boost-1.50.0-fix-non-utf8-files.patch
-
+Patch4:		boost-1.50.0-fix-non-utf8-files.patch
 # Add a manual page for the sole executable, namely bjam, based on the
 # on-line documentation:
 # http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
-Patch5: boost-1.48.0-add-bjam-man-page.patch
-
+Patch5:		boost-1.48.0-add-bjam-man-page.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=756005
 # https://svn.boost.org/trac/boost/ticket/6131
-Patch7: boost-1.50.0-foreach.patch
-
+Patch7:		boost-1.50.0-foreach.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=783660
 # https://svn.boost.org/trac/boost/ticket/6459 fixed
-Patch10: boost-1.50.0-long-double-1.patch
-
+Patch10:	boost-1.50.0-long-double-1.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=784654
-Patch12: boost-1.50.0-polygon.patch
-
+Patch12:	boost-1.50.0-polygon.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=828856
 # https://bugzilla.redhat.com/show_bug.cgi?id=828857
-Patch15: boost-1.50.0-pool.patch
-
+Patch15:	boost-1.50.0-pool.patch
 BuildRequires:	doxygen
 BuildRequires:	xsltproc
 BuildRequires:	bzip2-devel
@@ -61,12 +85,14 @@ libraries. The emphasis is on libraries which work well with the C++
 Standard Library. This package contains only the shared libraries
 needed for running programs using Boost.
 
+#----------------------------------------------------------------------------
+
 # build section Taken from the Fedora .src.rpm.
 %package build
-Summary: Cross platform build system for C++ projects
-Group: Development/C++
-Requires: boost-jam
-BuildArch: noarch
+Summary:	Cross platform build system for C++ projects
+Group:		Development/C++
+Requires:	boost-jam
+BuildArch:	noarch
 
 %description build
 Boost.Build is an easy way to build C++ projects, everywhere. You name
@@ -76,153 +102,13 @@ creating static and shared libraries, making pieces of executable, and other
 chores -- whether you're using GCC, MSVC, or a dozen more supported
 C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.
 
-%define boostlibs chrono coroutine date_time filesystem graph iostreams locale log math prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization context atomic
+%files build
+%doc LICENSE_1_0.txt
+%{_datadir}/boost-build/
 
-# (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
-# The sed script adds _ when library name ends in number.
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%global libname$lib2 %%mklibname boost_$(echo $lib | sed 's,[0-9]$,&_,') %{version}
-%%package -n %%{libname$lib2}
-Summary:	Boost $lib shared library
-# no one should require this, but provided anyway for maximum compatibility:
-Provides:	boost = %version-%release
-Group:		System/Libraries
-EOF
-done)}
-# (Anssi 01/2010) splitted expand contents due to rpm bug failing build,
-# triggered by a too long expanded string.
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%description -n %%{libname$lib2}
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains the shared library needed for
-running programs dynamically linked against Boost $lib.
-EOF
-done)}
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%files -n %%{libname$lib2}
-%%doc LICENSE_1_0.txt
-%{_libdir}/libboost_$lib*.so.%{version}
-EOF
-done)}
+#----------------------------------------------------------------------------
 
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%global devname$lib2 %%mklibname -d boost_$(echo $lib | sed 's,[0-9]$,&_,')
-%%package -n %%{devname$lib2}
-Summary:	Development files for Boost $lib
-Group:		Development/C++
-Provides:	boost-$lib-devel = %EVRD
-Requires:	%{libname$lib2} = %EVRD
-Requires:	%{coredevel} = %EVRD
-EOF
-done)}
-# (Anssi 01/2010) splitted expand contents due to rpm bug failing build,
-# triggered by a too long expanded string.
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%description -n %%{devname$lib2}
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains the shared library needed for
-running programs dynamically linked against Boost $lib.
-EOF
-done)}
-%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
-%%files -n %%{devname$lib2}
-%optional %{_libdir}/libboost_$lib*.so
-%optional %{_includedir}/boost/$lib
-%optional %{_includedir}/boost/$lib.h
-%optional %{_includedir}/boost/$lib.hpp
-%optional %{_includedir}/boost/${lib}_fwd.hpp
-%if "$lib2" == "unit_test_framework"
-%{_includedir}/boost/test
-%endif
-EOF
-done)}
-
-%define develonly accumulators algorithm archive asio assign attributes bimap bind circular_buffer container dynamic_bitset exception flyweight format function functional fusion geometry integer mpi mpl msm multi_array multi_index multiprecision optional parameter phoenix predef preprocessor range ratio signals2 smart_ptr spirit tr1 tti tuple type_erasure type_traits units unordered utility uuid variant xpressive
-
-%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
-%%global devname$lib2 %%mklibname -d boost_$(echo $lib | sed 's,[0-9]$,&_,')
-%%package -n %%{devname$lib2}
-Summary:	Development files for Boost $lib
-Group:		Development/C++
-Provides:	boost-$lib-devel = %EVRD
-Requires:	%{coredevel} = %EVRD
-EOF
-done)}
-# (Anssi 01/2010) splitted expand contents due to rpm bug failing build,
-# triggered by a too long expanded string.
-%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
-%%description -n %%{devname$lib2}
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains the shared library needed for
-running programs dynamically linked against Boost $lib.
-EOF
-done)}
-%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
-%%files -n %%{devname$lib2}
-%optional %{_includedir}/boost/$lib
-%optional %{_includedir}/boost/$lib.h
-%optional %{_includedir}/boost/$lib.hpp
-%optional %{_includedir}/boost/${lib}_fwd.hpp
-%if "$lib" == "unordered"
-%{_includedir}/boost/unordered_map.hpp
-%{_includedir}/boost/unordered_set.hpp
-%endif
-EOF
-done)}
-
-%package -n	%{coredevel}
-Summary:	Core development files needed by all or most Boost components
-Group:		Development/C++
-
-%description -n	%{coredevel}
-Core development files needed by all or most Boost components
-
-%package -n	%{libnamedevel}
-Summary:	The libraries and headers needed for Boost development
-Group:		Development/C++
-Requires:	%{expand:%(for lib in %boostlibs %develonly; do echo -n "%%{devname${lib/-/_}} = %{version}-%{release} "; done)}
-Obsoletes:	%{mklibname boost 1}-devel < %{version}-%{release}
-Provides:	%{name}-devel = %{version}-%{release}
-Provides:	lib%{name}-devel = %{version}-%{release}
-
-%description -n	%{libnamedevel}
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains headers and shared library
-symlinks needed for Boost development.
-
-%package -n	%{libnamedevel}-doc
-Summary:	The libraries and headers needed for Boost development
-Group:	Development/C++
-Conflicts:	libboost-devel < 1.41.0
-Conflicts:	lib64boost-devel < 1.41.0
-Obsoletes:	libboost-devel-doc < 1.48.0-2
-Obsoletes:	lib64boost-devel-doc < 1.48.0-2
-BuildArch:	noarch
-
-%description -n  %{libnamedevel}-doc
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains documentation needed for Boost
-development.
-
-%package -n	%{libnamestaticdevel}
-Summary:	Static libraries for Boost development
-Group:		Development/C++
-Requires:	%{libnamedevel} = %{version}-%{release}
-Obsoletes:	%{mklibname boost 1}-static-devel < %{version}-%{release}
-Provides:	%{name}-static-devel = %{version}-%{release}
-
-%description -n	%{libnamestaticdevel}
-Boost is a collection of free peer-reviewed portable C++ source
-libraries. The emphasis is on libraries which work well with the C++
-Standard Library. This package contains only the static libraries
-needed for Boost development.
-
-%package 	examples
+%package examples
 Summary:	The examples for the Boost libraries
 Group:		Development/C++
 BuildArch:	noarch
@@ -233,6 +119,632 @@ libraries. The emphasis is on libraries which work well with the C++
 Standard Library. This package contains examples, installed in the
 same place as the documentation.
 
+%files examples
+%doc examples/*
+
+#----------------------------------------------------------------------------
+
+%package -n %{libatomic}
+Summary:	Boost atomic shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libatomic}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost atomic.
+
+%files -n %{libatomic}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_atomic.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libchrono}
+Summary:	Boost chrono shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libchrono}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost chrono.
+
+%files -n %{libchrono}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_chrono.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libcontext}
+Summary:	Boost context shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libcontext}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost context.
+
+%files -n %{libcontext}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_context.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libcoroutine}
+Summary:	Boost coroutine shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libcoroutine}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost coroutine.
+
+%files -n %{libcoroutine}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_coroutine.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libdatetime}
+Summary:	Boost date_time shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libdatetime}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost datetime.
+
+%files -n %{libdatetime}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_date_time.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libfilesystem}
+Summary:	Boost filesystem shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libfilesystem}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost filesystem.
+
+%files -n %{libfilesystem}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_filesystem.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libgraph}
+Summary:	Boost graph shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libgraph}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost graph.
+
+%files -n %{libgraph}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_graph.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libiostreams}
+Summary:	Boost iostreams shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libiostreams}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost iostreams.
+
+%files -n %{libiostreams}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_iostreams.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{liblocale}
+Summary:	Boost locale shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{liblocale}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost locale.
+
+%files -n %{liblocale}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_locale.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{liblog}
+Summary:	Boost log shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{liblog}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost log.
+
+%files -n %{liblog}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_log.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{liblogsetup}
+Summary:	Boost log_setup shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{liblogsetup}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost log_setup.
+
+%files -n %{liblogsetup}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_log_setup.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathc99}
+Summary:	Boost math_c99 shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathc99}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_c99.
+
+%files -n %{libmathc99}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_c99.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathc99f}
+Summary:	Boost math_c99f shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathc99f}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_c99f.
+
+%files -n %{libmathc99f}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_c99f.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathc99l}
+Summary:	Boost math_c99l shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathc99l}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_c99l.
+
+%files -n %{libmathc99l}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_c99l.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathtr1}
+Summary:	Boost math_tr1 shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathtr1}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_tr1.
+
+%files -n %{libmathtr1}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_tr1.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathtr1f}
+Summary:	Boost math_tr1f shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathtr1f}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_tr1f.
+
+%files -n %{libmathtr1f}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_tr1f.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libmathtr1l}
+Summary:	Boost math_tr1l shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libmathtr1l}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost math_tr1l.
+
+%files -n %{libmathtr1l}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_math_tr1l.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libprgexecmonitor}
+Summary:	Boost prg_exec_monitor shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libprgexecmonitor}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost prg_exec_monitor.
+
+%files -n %{libprgexecmonitor}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_prg_exec_monitor.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libprogramoptions}
+Summary:	Boost program_options shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libprogramoptions}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost program_options.
+
+%files -n %{libprogramoptions}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_program_options.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libpython}
+Summary:	Boost python shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libpython}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost python.
+
+%files -n %{libpython}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_python.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{librandom}
+Summary:	Boost random shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{librandom}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost random.
+
+%files -n %{librandom}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_random.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libregex}
+Summary:	Boost regex shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libregex}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost regex.
+
+%files -n %{libregex}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_regex.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libserialization}
+Summary:	Boost serialization shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libserialization}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost serialization.
+
+%files -n %{libserialization}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_serialization.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libsignals}
+Summary:	Boost signals shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libsignals}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost signals.
+
+%files -n %{libsignals}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_signals.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libsystem}
+Summary:	Boost system shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libsystem}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost system.
+
+%files -n %{libsystem}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_system.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libthread}
+Summary:	Boost thread shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libthread}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost thread.
+
+%files -n %{libthread}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_thread.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libtimer}
+Summary:	Boost timer shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libtimer}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost timer.
+
+%files -n %{libtimer}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_timer.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libunittestframework}
+Summary:	Boost unit_test_framework shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libunittestframework}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost unit_test_framework.
+
+%files -n %{libunittestframework}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_unit_test_framework.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libwave}
+Summary:	Boost wave shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libwave}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost wave.
+
+%files -n %{libwave}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_wave.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{libwserialization}
+Summary:	Boost wserialization shared library
+Group:		System/Libraries
+# no one should require this, but provided anyway for maximum compatibility:
+Provides:	boost = %{EVRD}
+
+%description -n %{libwserialization}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains the shared library needed for
+running programs dynamically linked against Boost wserialization.
+
+%files -n %{libwserialization}
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_wserialization.so.%{version}
+
+#----------------------------------------------------------------------------
+
+%package -n %{devname}
+Summary:	The libraries and headers needed for Boost development
+Group:		Development/C++
+Requires:	%{libatomic} = %{EVRD}
+Requires:	%{libchrono} = %{EVRD}
+Requires:	%{libcontext} = %{EVRD}
+Requires:	%{libcoroutine} = %{EVRD}
+Requires:	%{libdatetime} = %{EVRD}
+Requires:	%{libfilesystem} = %{EVRD}
+Requires:	%{libgraph} = %{EVRD}
+Requires:	%{libiostreams} = %{EVRD}
+Requires:	%{liblocale} = %{EVRD}
+Requires:	%{liblog} = %{EVRD}
+Requires:	%{liblogsetup} = %{EVRD}
+Requires:	%{libmathc99} = %{EVRD}
+Requires:	%{libmathc99f} = %{EVRD}
+Requires:	%{libmathc99l} = %{EVRD}
+Requires:	%{libmathtr1} = %{EVRD}
+Requires:	%{libmathtr1f} = %{EVRD}
+Requires:	%{libmathtr1l} = %{EVRD}
+Requires:	%{libprgexecmonitor} = %{EVRD}
+Requires:	%{libprogramoptions} = %{EVRD}
+Requires:	%{libpython} = %{EVRD}
+Requires:	%{librandom} = %{EVRD}
+Requires:	%{libregex} = %{EVRD}
+Requires:	%{libserialization} = %{EVRD}
+Requires:	%{libsignals} = %{EVRD}
+Requires:	%{libsystem} = %{EVRD}
+Requires:	%{libthread} = %{EVRD}
+Requires:	%{libtimer} = %{EVRD}
+Requires:	%{libunittestframework} = %{EVRD}
+Requires:	%{libwave} = %{EVRD}
+Requires:	%{libwserialization} = %{EVRD}
+Provides:	%{name}-devel = %{EVRD}
+Provides:	lib%{name}-devel = %{EVRD}
+
+%description -n %{devname}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains headers and shared library
+symlinks needed for Boost development.
+
+%files -n %{devname}
+%{_libdir}/libboost_*.so
+%{_includedir}/boost
+
+#----------------------------------------------------------------------------
+
+%package -n %{devname}-doc
+Summary:	The libraries and headers needed for Boost development
+Group:		Development/C++
+BuildArch:	noarch
+
+%description -n %{devname}-doc
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains documentation needed for Boost
+development.
+
+%files -n %{devname}-doc
+%doc packagedoc/*
+
+#----------------------------------------------------------------------------
+
+%package -n %{sdevname}
+Summary:	Static libraries for Boost development
+Group:		Development/C++
+Requires:	%{devname} = %{EVRD}
+Provides:	%{name}-static-devel = %{EVRD}
+
+%description -n %{sdevname}
+Boost is a collection of free peer-reviewed portable C++ source
+libraries. The emphasis is on libraries which work well with the C++
+Standard Library. This package contains only the static libraries
+needed for Boost development.
+
+%files -n %{sdevname}
+%{_libdir}/libboost_*.a
+
+#----------------------------------------------------------------------------
+
 %prep
 %setup -q -n boost_%{packver}
 %patch4 -p1
@@ -255,14 +767,14 @@ find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*to
 %build
 %define gcc_ver %(rpm -q --queryformat="%%{VERSION}" gcc)
 cat > ./tools/build/v2/user-config.jam << EOF
-using gcc : %gcc_ver : gcc : <cflags>"%optflags -I%{_includedir}/python%{py_ver}" <cxxflags>"%optflags -I%{_includedir}/python%{py_ver}" <linkflags>"%ldflags" ;
-using python : %py_ver : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} ;
+using gcc : %{gcc_ver} : gcc : <cflags>"%{optflags} -I%{_includedir}/python%{py_ver}" <cxxflags>"%{optflags} -I%{_includedir}/python%{py_ver}" <linkflags>"%{ldflags}" ;
+using python : %{py_ver} : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} ;
 EOF
 ./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir}
 ./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
 	--prefix=%{_prefix} --libdir=%{_libdir} \
 %if !%{with context}
-        --without-context --without-coroutine \
+	--without-context --without-coroutine \
 %endif
 	linkflags="%{ldflags} -lpython%{py_ver} -lstdc++ -lm" \
 	-sHAVE_ICU=1 \
@@ -277,7 +789,7 @@ echo ============================= build Boost.Build ==================
 ./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
 	--prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} \
 %if !%{with context}
-        --without-context --without-coroutine \
+	--without-context --without-coroutine \
 %endif
 	link=shared \
 	install
@@ -298,123 +810,3 @@ echo ============================= install Boost.Build ==================
 rm -f %{buildroot}/%{_bindir}/bjam
 rm -f %{buildroot}/%{_mandir}/man1/bjam.1*
 
-%files -n %{coredevel}
-%dir %{_includedir}/boost
-%{_includedir}/boost/aligned_storage.hpp
-%{_includedir}/boost/any.hpp
-%{_includedir}/boost/array.hpp
-%{_includedir}/boost/assert.hpp
-%{_includedir}/boost/blank.hpp
-%{_includedir}/boost/blank_fwd.hpp
-%{_includedir}/boost/call_traits.hpp
-%{_includedir}/boost/cast.hpp
-%{_includedir}/boost/cerrno.hpp
-%{_includedir}/boost/checked_delete.hpp
-%{_includedir}/boost/compatibility
-%{_includedir}/boost/compressed_pair.hpp
-%{_includedir}/boost/concept
-%{_includedir}/boost/concept_archetype.hpp
-%{_includedir}/boost/concept_check.hpp
-%{_includedir}/boost/concept_check
-%{_includedir}/boost/config.hpp
-%{_includedir}/boost/config
-%{_includedir}/boost/crc.hpp
-%{_includedir}/boost/cregex.hpp
-%{_includedir}/boost/cstdint.hpp
-%{_includedir}/boost/cstdlib.hpp
-%{_includedir}/boost/current_function.hpp
-%{_includedir}/boost/detail
-%{_includedir}/boost/enable_shared_from_this.hpp
-%{_includedir}/boost/exception_ptr.hpp
-%{_includedir}/boost/foreach.hpp
-%{_includedir}/boost/foreach_fwd.hpp
-%{_includedir}/boost/function_equal.hpp
-%{_includedir}/boost/function_output_iterator.hpp
-%{_includedir}/boost/function_types
-%{_includedir}/boost/generator_iterator.hpp
-%{_includedir}/boost/get_pointer.hpp
-%{_includedir}/boost/gil
-%{_includedir}/boost/heap
-%{_includedir}/boost/icl
-%{_includedir}/boost/implicit_cast.hpp
-%{_includedir}/boost/indirect_reference.hpp
-%{_includedir}/boost/integer_traits.hpp
-%{_includedir}/boost/interprocess
-%{_includedir}/boost/intrusive
-%{_includedir}/boost/intrusive_ptr.hpp
-%{_includedir}/boost/io
-%{_includedir}/boost/io_fwd.hpp
-%{_includedir}/boost/is_placeholder.hpp
-%{_includedir}/boost/iterator.hpp
-%{_includedir}/boost/iterator
-%{_includedir}/boost/iterator_adaptors.hpp
-%{_includedir}/boost/lambda
-%{_includedir}/boost/last_value.hpp
-%{_includedir}/boost/lexical_cast.hpp
-%{_includedir}/boost/limits.hpp
-%{_includedir}/boost/local_function.hpp
-%{_includedir}/boost/local_function
-%{_includedir}/boost/lockfree
-%{_includedir}/boost/logic
-%{_includedir}/boost/make_shared.hpp
-%{_includedir}/boost/mem_fn.hpp
-%{_includedir}/boost/memory_order.hpp
-%{_includedir}/boost/move
-%{_includedir}/boost/multi_index_container.hpp
-%{_includedir}/boost/multi_index_container_fwd.hpp
-%{_includedir}/boost/next_prior.hpp
-%{_includedir}/boost/non_type.hpp
-%{_includedir}/boost/noncopyable.hpp
-%{_includedir}/boost/nondet_random.hpp
-%{_includedir}/boost/none.hpp
-%{_includedir}/boost/none_t.hpp
-%{_includedir}/boost/numeric
-%{_includedir}/boost/operators.hpp
-%{_includedir}/boost/pending
-%{_includedir}/boost/pointee.hpp
-%{_includedir}/boost/pointer_cast.hpp
-%{_includedir}/boost/pointer_to_other.hpp
-%{_includedir}/boost/polygon
-%{_includedir}/boost/pool
-%{_includedir}/boost/progress.hpp
-%{_includedir}/boost/property_map
-%{_includedir}/boost/property_tree
-%{_includedir}/boost/proto
-%{_includedir}/boost/ptr_container
-%{_includedir}/boost/rational.hpp
-%{_includedir}/boost/ref.hpp
-%{_includedir}/boost/scope_exit.hpp
-%{_includedir}/boost/scoped_array.hpp
-%{_includedir}/boost/scoped_ptr.hpp
-%{_includedir}/boost/shared_array.hpp
-%{_includedir}/boost/shared_container_iterator.hpp
-%{_includedir}/boost/shared_ptr.hpp
-%{_includedir}/boost/signal.hpp
-%{_includedir}/boost/statechart
-%{_includedir}/boost/static_assert.hpp
-%{_includedir}/boost/strong_typedef.hpp
-%{_includedir}/boost/swap.hpp
-%{_includedir}/boost/throw_exception.hpp
-%{_includedir}/boost/token_functions.hpp
-%{_includedir}/boost/token_iterator.hpp
-%{_includedir}/boost/tokenizer.hpp
-%{_includedir}/boost/type.hpp
-%{_includedir}/boost/typeof
-%{_includedir}/boost/version.hpp
-%{_includedir}/boost/visit_each.hpp
-%{_includedir}/boost/weak_ptr.hpp
-
-%files -n %{libnamedevel}
-
-%files -n %{libnamedevel}-doc
-%doc packagedoc/*
-
-%files -n %{libnamestaticdevel}
-%{_libdir}/libboost_*.a
-
-%files examples
-%doc examples/*
-
-%files build
-%doc LICENSE_1_0.txt
-%{_datadir}/boost-build/