[qpid-cpp/f17] fix build when size_t != unsigned int

[Dan Horák]

commit 1fa0884d1842714ee18fa574820326b1633d77d2
Author: Dan Horák <dan at danny.cz>
Date:   Tue Apr 17 11:41:36 2012 +0200

    fix build when size_t != unsigned int

 qpid-0.14-size_t.patch |   12 ++++++++++++
 qpid-cpp.spec          |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/qpid-0.14-size_t.patch b/qpid-0.14-size_t.patch
new file mode 100644
index 0000000..034f7e1
--- /dev/null
+++ b/qpid-0.14-size_t.patch
@@ -0,0 +1,12 @@
+diff -up qpid-0.14/cpp/src/qpid/broker/MessageGroupManager.cpp.size_t qpid-0.14/cpp/src/qpid/broker/MessageGroupManager.cpp
+--- qpid-0.14/cpp/src/qpid/broker/MessageGroupManager.cpp.size_t	2012-04-17 10:59:20.000000000 +0200
++++ qpid-0.14/cpp/src/qpid/broker/MessageGroupManager.cpp	2012-04-17 10:59:40.000000000 +0200
+@@ -280,7 +280,7 @@ void MessageGroupManager::query(qpid::ty
+          g != messageGroups.end(); ++g) {
+         qpid::types::Variant::Map info;
+         info[GROUP_ID_KEY] = g->first;
+-        info[GROUP_MSG_COUNT] = g->second.members.size();
++        info[GROUP_MSG_COUNT] = (uint64_t)g->second.members.size();
+         info[GROUP_TIMESTAMP] = 0;   /** @todo KAG - NEED HEAD MSG TIMESTAMP */
+         info[GROUP_CONSUMER] = g->second.owner;
+         groups.push_back(info);
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index db153bf..077dfcf 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -100,7 +100,7 @@
 
 Name:           %{name}
 Version:        %{qpid_release}
-Release:        %{release_num}%{?dist}.2
+Release:        %{release_num}%{?dist}.3
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -118,6 +118,9 @@ Patch1:         unistd.patch
 # Fedora ticket: https://bugzilla.redhat.com/show_bug.cgi?id=761045
 Patch6:         qpid-cpp-singleton.patch
 Patch7:         store.patch
+# fix build when size_t != unsigned int
+# Upstream ticket (Apache JIRA): https://issues.apache.org/jira/browse/QPID-3952
+Patch8:         qpid-0.14-size_t.patch
 %endif
 
 %if %{rhel_4}
@@ -865,6 +868,7 @@ popd
 pushd ../store-%{qpid_release}.%{store_svnrev}
 %patch7 -p1
 popd
+%patch8 -p1 -b .size_t
 %endif
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -1179,6 +1183,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 17 2012 Dan Horák <dan[at]danny.cz> - 0.14-1.3
+- fix build when size_t != unsigned int
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-1.2
 - Rebuilt for c++ ABI breakage