[mingw32-boost/f15: 7/7] Merge remote-tracking branch 'origin/master' into f15

[sailer]

commit d32dcee92308c7f8028e4e9ea3c441397dbf31a1
Merge: be3668b e33dd7a
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Fri Sep 2 10:41:55 2011 +0200

    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	.gitignore
    	mingw32-boost.spec
    	sources

 .gitignore                                         |    4 +
 boost-1.46.0-unordered-cctor.patch                 |   92 -
 boost-1.46.1-cmakeify-full.patch                   |38483 ++++++++++++++++++++
 ...erase.patch => boost-1.46.1-signals-erase.patch |    0
 boost-1.46.1-spirit.patch                          |   59 +
 mingw32-boost.spec                                 |   27 +-
 sources                                            |    2 +-
 7 files changed, 38558 insertions(+), 109 deletions(-)
---
diff --cc .gitignore
index 5a92efb,921f126..fd1fcbf
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,4 +2,8 @@@ boost_1_39_0.tar.bz
  boost-1.41.0.cmake0.tar.bz2
  /boost_1_44_0.tar.bz2
  /boost_1_46_0_beta1.tar.bz2
++<<<<<<< HEAD
 +/boost_1_46_0.tar.bz2
++=======
+ /boost_1_46_1.tar.bz2
++>>>>>>> origin/master
diff --cc mingw32-boost.spec
index a42357a,468929e..dfa947f
--- a/mingw32-boost.spec
+++ b/mingw32-boost.spec
@@@ -8,11 -8,11 +8,11 @@@
  %global name1 boost
  
  Name:           mingw32-%{name1}
- Version:        1.46.0
- %global version_enc 1_46_0
- %global dllboostver 1_46
+ Version:        1.46.1
+ %global version_enc 1_46_1
+ %global dllboostver 1_46_1
 -%global dllgccver gcc46
 -Release:        2%{?dist}
 +%global dllgccver gcc45
 +Release:        1%{?dist}
  Summary:        MinGW Windows port of Boost C++ Libraries
  
  License:        Boost
@@@ -29,14 -29,10 +29,11 @@@ Group:          Development/Librarie
  %define toplev_dirname %{name1}_%{version_enc}
  URL:            http://www.boost.org
  Source:         http://downloads.sourceforge.net/%{name1}/%{toplev_dirname}.tar.bz2
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  # CMake-related files (CMakeLists.txt and module.cmake files)
- Patch0:         boost-1.46.0-cmakeify-full.patch
- # Mainly Web-related documentation for the Trac Wiki devoted to "old"
- # Boost-CMake (up-to-date until Boost-1.41.0). Now part of 
- # boost-1.46.0-cmakeify-full.patch
- #Patch1:         boost-1.46.0-cmakeify-more.patch
+ Patch0:         boost-1.46.1-cmakeify-full.patch
+ 
  Patch2:         boost-cmake-soname.patch
  
  # The patch may break c++03, and there is therefore no plan yet to include
@@@ -49,9 -42,8 +43,9 @@@ Patch3:         boost-1.46.1-signals-er
  # http://comments.gmane.org/gmane.comp.lib.boost.devel/214323
  # Has been fixed on Boost trunk (will be fixed in Boost-1.47:
  #  https://svn.boost.org/trac/boost/changeset/68725)
- Patch5:         boost-1.46.0-spirit.patch
+ Patch5:         boost-1.46.1-spirit.patch
  
 +
  BuildArch:      noarch
  
  BuildRequires:  cmake
@@@ -319,8 -309,14 +311,11 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Tue Jun 28 2011 Kalev Lember <kalev at smartlink.ee> - 1.46.1-2
 -- Rebuilt for mingw32-gcc 4.6
 -
 -* Tue Jun 21 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.46.1-1
++* Fri Sep  2 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.46.1-1
+ - update to 1.46.1
+ 
 -* Sat May 21 2011 Kalev Lember <kalev at smartlink.ee> - 1.46.0-0.3.beta1
 -- Own the _mingw32_datadir/cmake/boost/ directory
 +* Wed Jun 22 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.46.0-1
 +- update to 1.46.0
  
  * Fri Apr 22 2011 Kalev Lember <kalev at smartlink.ee> - 1.46.0-0.2.beta1
  - Rebuilt for pseudo-reloc version mismatch (#698827)