[boost/f15/master] Revert "Merged the latest changes from the bug-fix release of Boost-1.46"

[Petr Machata]

commit 38d9dfbb7a4abc2659926abf55e852faa5805c46
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Mar 15 13:42:14 2011 +0100

    Revert "Merged the latest changes from the bug-fix release of Boost-1.46"
    
    - This reverts commit 0105dae1e63101391c21de6ba479b0f579c08d98.
    - This is temporary.  We will probably want to introduce many, if not all
      changes made in 1.46.1.  But we will have to bring them in as a patch,
      without the soname bump.

 ...-full.patch => boost-1.46.0-cmakeify-full.patch |    0
 ...-more.patch => boost-1.46.0-cmakeify-more.patch |    0
 ...1-cmakeify.patch => boost-1.46.0-cmakeify.patch |    0
 ...erase.patch => boost-1.46.0-signals-erase.patch |    0
 ....46.1-spirit.patch => boost-1.46.0-spirit.patch |    0
 boost.spec                                         |   27 ++++++++-----------
 sources                                            |    2 +-
 7 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/boost-1.46.1-cmakeify-full.patch b/boost-1.46.0-cmakeify-full.patch
similarity index 100%
rename from boost-1.46.1-cmakeify-full.patch
rename to boost-1.46.0-cmakeify-full.patch
diff --git a/boost-1.46.1-cmakeify-more.patch b/boost-1.46.0-cmakeify-more.patch
similarity index 100%
rename from boost-1.46.1-cmakeify-more.patch
rename to boost-1.46.0-cmakeify-more.patch
diff --git a/boost-1.46.1-cmakeify.patch b/boost-1.46.0-cmakeify.patch
similarity index 100%
rename from boost-1.46.1-cmakeify.patch
rename to boost-1.46.0-cmakeify.patch
diff --git a/boost-1.46.1-signals-erase.patch b/boost-1.46.0-signals-erase.patch
similarity index 100%
rename from boost-1.46.1-signals-erase.patch
rename to boost-1.46.0-signals-erase.patch
diff --git a/boost-1.46.1-spirit.patch b/boost-1.46.0-spirit.patch
similarity index 100%
rename from boost-1.46.1-spirit.patch
rename to boost-1.46.0-spirit.patch
diff --git a/boost.spec b/boost.spec
index db3e84d..34b5436 100644
--- a/boost.spec
+++ b/boost.spec
@@ -21,9 +21,9 @@
 
 Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
-Version: 1.46.1
-%define version_enc 1_46_1
-Release: 1%{?dist}
+Version: 1.46.0
+%define version_enc 1_46_0
+Release: 0.4%{?dist}
 License: Boost
 
 # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -82,24 +82,24 @@ BuildRequires: libicu-devel
 BuildRequires: chrpath
 
 # CMake-related files (CMakeLists.txt and module.cmake files)
-Patch0: boost-1.46.1-cmakeify-full.patch
+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.1-cmakeify-full.patch
-#Patch1: boost-1.46.1-cmakeify-more.patch
+# boost-1.46.0-cmakeify-full.patch
+#Patch1: boost-1.46.0-cmakeify-more.patch
 Patch2: boost-cmake-soname.patch
 
 # The patch may break c++03, and there is therefore no plan yet to include
 # it upstream: https://svn.boost.org/trac/boost/ticket/4999
-Patch3: boost-1.46.1-signals-erase.patch
+Patch3: boost-1.46.0-signals-erase.patch
 
-# Has been fixed in Boost-1.46.1: https://svn.boost.org/trac/boost/ticket/5119
-#Patch4: boost-1.46.0-unordered-cctor.patch
+# Will be fixed in Boost-1.47: https://svn.boost.org/trac/boost/ticket/5119
+Patch4: boost-1.46.0-unordered-cctor.patch
 
 # 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.1-spirit.patch
+Patch5: boost-1.46.0-spirit.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -426,6 +426,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH2} | %{__patch} -p0 --fuzz=0
 
 # fixes
 %patch3 -p1
+%patch4 -p2
 %patch5 -p0
 
 
@@ -840,12 +841,6 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
 %{_bindir}/bjam
 
 %changelog
-* Sun Mar 13 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.46.1-1
-- Merged the latest changes from the bug-fix release of Boost-1.46
-
-* Mon Mar 07 2011 Caolán McNamara <caolanm at redhat.com> - 1.46.0-0.5
-- rebuild for icu 4.6
-
 * Thu Feb 24 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.46.0-0.4
 - Merged the latest changes from the now final release of Boost-1.46
 
diff --git a/sources b/sources
index b01f081..5ebdedb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7375679575f4c8db605d426fc721d506  boost_1_46_1.tar.bz2
+37b12f1702319b73876b0097982087e0  boost_1_46_0.tar.bz2