Merge remote branch 'origin/master'

Conflicts:
	boost.spec

boost.spec

@@ -23,7 +23,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.44.0
 %define pristine_version 1_44_0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: Boost
 
 # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -364,6 +364,29 @@ backend to do the parallel work.
 
 %endif
 
+%package build
+Summary: Cross platform build system for C++ projects
+Group: Development/Tools
+Requires: boost-jam
+BuildArch: noarch
+
+%description build
+Boost.Build is an easy way to build C++ projects, everywhere. You 
+name your executables and libraries and list their sources. 
+Boost.Build takes care about compiling your sources with the right 
+options, creating static and shared libraries, making executables, 
+and other chores -- whether you're using gcc, msvc, or a dozen 
+more supported C++ compilers -- on Windows, OSX, Linux and 
+commercial UNIX systems. 
+
+%package jam
+Summary: A low-level build tool
+Group: Development/Tools
+
+%description jam
+Boost.Jam (BJam) is the low-level build engine tool for Boost.Build.
+Historically, Boost.Jam is based on on FTJam and on Perforce Jam but has grown
+a number of significant features and is now developed independently
 
 %prep
 %setup -q -n %{full_pristine_version}
@@ -422,6 +445,12 @@ export MPI_COMPILER
 %{_mpich2_unload}
 %endif
 
+# Build Boost Jam
+echo ============================= build Jam ==================
+pushd tools/jam
+export CFLAGS="%{optflags}"
+./build_dist.sh
+popd
 
 %check
 %if %{with tests}
@@ -522,6 +551,20 @@ done
 %{__rm} -f tmp-doc-directories
 %{__install} -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm index.html
 
+echo ============================= install jam ==================
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+pushd tools/jam
+%{__install} -m 755 stage/bin.linux*/bjam $RPM_BUILD_ROOT%{_bindir}
+popd
+
+echo ============================= install build ==================
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/boost-build
+pushd tools/build/v2
+cp -a boost-build.jam bootstrap.jam build-system.jam build/ kernel/ options/ tools/ util/ user-config.jam $RPM_BUILD_ROOT%{_datadir}/boost-build/
+# Not a real file
+rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/build/project.ann.py
+popd
+
 # Remove scripts used to generate include files
 find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{__rm} -f {} \;
 
@@ -743,11 +786,29 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
 
 %endif
 
+%files build
+%defattr(-, root, root, -)
+%{_datadir}/boost-build/
+
+%files jam
+%defattr(-, root, root, -)
+%doc LICENSE_1_0.txt
+%{_bindir}/bjam
+
 %changelog
-* Wed Dec  8 2010 Petr Machata <pmachata@redhat.com> - 1.44.0-2
+* Wed Dec  8 2010 Petr Machata <pmachata@redhat.com> - 1.44.0-4
 - Build with support for iostreams deprecated functions
 - Resolves: #654480
 
+* Fri Dec  3 2010 Tom "spot" Callaway <spot@fedoraproject.org> - 1.44.0-3
+- also package build-system.jam in boost-build
+
+* Tue Nov 30 2010 Tom "spot" Callaway <spot@fedoraproject.org> - 1.44.0-2
+- add boost-build, boost-jam subpackages
+
+* Sat Oct 23 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-1.1
+- Rebuild.
+
 * Sat Aug 21 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-1
 - Split the CMake-buildable tar-ball into pristine upstream tar-ball
   and CMake framework patch