[qpid-cpp] Fixed the Boost.Singleton issue (thanks to Petr Machata's patch: #761045)

[Denis Arnaud]

commit 7d1d7c79cb853834e2e32af45b42bcd973b8173b
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Thu Dec 8 02:02:47 2011 +0100

    Fixed the Boost.Singleton issue (thanks to Petr Machata's patch: #761045)

 qpid-cpp-singleton.patch |   22 ++++++++++++++++++++++
 qpid-cpp.spec            |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/qpid-cpp-singleton.patch b/qpid-cpp-singleton.patch
new file mode 100644
index 0000000..6525732
--- /dev/null
+++ b/qpid-cpp-singleton.patch
@@ -0,0 +1,22 @@
+diff -up qpid-0.12/cpp/src/qpid/log/Logger.cpp\~ qpid-0.12/cpp/src/qpid/log/Logger.cpp
+--- qpid-0.12/cpp/src/qpid/log/Logger.cpp~	2011-05-02 15:20:36.000000000 +0200
++++ qpid-0.12/cpp/src/qpid/log/Logger.cpp	2011-12-07 21:11:15.238671000 +0100
+@@ -23,7 +23,7 @@
+ #include "qpid/sys/Thread.h"
+ #include "qpid/sys/Time.h"
+ #include "qpid/DisableExceptionLogging.h"
+-#include <boost/pool/detail/singleton.hpp>
++#include <boost/serialization/singleton.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
+ #include <algorithm>
+@@ -45,7 +45,7 @@ inline void Logger::enable_unlocked(Stat
+ }
+ 
+ Logger& Logger::instance() {
+-    return boost::details::pool::singleton_default<Logger>::instance();
++    return boost::serialization::singleton<Logger>::get_mutable_instance();
+ }
+ 
+ Logger::Logger() : flags(0) {
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 4dc1175..f5d5bc9 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -27,7 +27,7 @@
 %global qpid_svnrev  1154981
 %global store_svnrev 4463
 # Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num  5
+%global release_num  6
 
 # NOTE: these flags should not both be set at the same time!
 # RHEL-6 builds should have all flags set to 0.
@@ -107,6 +107,7 @@ Source1:        store-%{qpid_release}.%{store_svnrev}.tar.gz
 %if %{fedora}
 Patch0:         configure.patch
 Patch1:         fedora.patch
+Patch6:         qpid-cpp-singleton.patch
 %endif
 
 %if %{rhel_4}
@@ -844,6 +845,7 @@ popd
 %if %{fedora}
 %patch0 -p0
 %patch1 -p2
+%patch6 -p1
 %endif
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -1142,6 +1144,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 08 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.12-6.2
+- Fixed the Boost.Singleton issue (thanks to Petr Machata's patch: #761045)
+
 * Wed Dec 07 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.12-5.2
 - Rebuilt for Boost-1.48