[boost/f14/master: 2/4] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/boost into f14

[Petr Machata]

commit ec67c1492c3e30b6d4dba06372b0af73b7c12753
Merge: 690e758 5b53d56
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Apr 1 19:14:41 2011 +0200

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/boost into f14
    
    Conflicts:
    	boost.spec

 .gitignore |    2 ++
 boost.spec |   22 ++++++++++++++--------
 sources    |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --cc boost.spec
index a14eca2,65d9eb9..46c6156
--- a/boost.spec
+++ b/boost.spec
@@@ -23,7 -23,7 +23,7 @@@ Name: boos
  Summary: The free peer-reviewed portable C++ source libraries
  Version: 1.44.0
  %define pristine_version 1_44_0
--Release: 7%{?dist}
++Release: 8%{?dist}
  License: Boost
  
  # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@@ -817,12 -819,10 +819,16 @@@ find $RPM_BUILD_ROOT%{_includedir}/ \( 
  %{_bindir}/bjam
  
  %changelog
- * Fri Apr  1 2011 Petr Machata <pmachata at redhat.com> - 1.44.0-7
++* Fri Apr  1 2011 Petr Machata <pmachata at redhat.com> - 1.44.0-8
 +- Yet another way to pass -DBOOST_LIB_INSTALL_DIR to cmake.  Passing
 +  via CMAKE_CXX_FLAGS for some reason breaks when rpm re-quotes the
 +  expression as a result of %%{optflags} expansion.
 +- Resolves: #667294
 +
+ * Mon Jan 10 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.44.0-7
+ - Integrated Petr's work to fix missing Boost.Filesystem V3 issue
+ - Resolves: #667740
+ 
  * Thu Jan  6 2011 Petr Machata <pmachata at redhat.com> - 1.44.0-6
  - Don't override CXXFLAGS with -DBOOST_IOSTREAMS_USE_DEPRECATED
  - Resolves: #667294