rpms/qpidc/F-10 qpidc_f12_new_cpg.diff, NONE, 1.1 qpidc.spec, 1.85, 1.86 examples.patch, 1.2, NONE
Fabio M. Di Nitto
fabbione at fedoraproject.org
Fri Jul 31 08:31:33 UTC 2009
- Previous message (by thread): rpms/resource-agents/F-10 resource-agents.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/gdb/devel gdb-readline-6.0.patch, NONE, 1.1 gdb-orphanripper.c, 1.2, 1.3 gdb.spec, 1.365, 1.366
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fabbione
Update of /cvs/pkgs/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25262
Modified Files:
qpidc.spec
Added Files:
qpidc_f12_new_cpg.diff
Removed Files:
examples.patch
Log Message:
Resync changes from F-11 to allow corosync/openais/cluster update in F-10.
Drop examples.patch that was not applied or used anywhere.
qpidc_f12_new_cpg.diff:
Cluster.cpp | 14 +++++++-------
Cluster.cpp.orig |only
Cluster.h | 12 ++++++------
Cluster.h.orig |only
Cpg.cpp | 12 ++++++------
Cpg.h | 24 ++++++++++++------------
6 files changed, 31 insertions(+), 31 deletions(-)
--- NEW FILE qpidc_f12_new_cpg.diff ---
diff -U3 -r qpidc-0.5.788782/src/qpid/cluster/Cluster.cpp qpidc-0.5.788782.new/src/qpid/cluster/Cluster.cpp
--- qpidc-0.5.788782/src/qpid/cluster/Cluster.cpp 2009-06-18 17:25:00.000000000 -0400
+++ qpidc-0.5.788782.new/src/qpid/cluster/Cluster.cpp 2009-06-29 14:02:02.980566645 -0400
@@ -292,11 +292,11 @@
// Deliver CPG message.
void Cluster::deliver(
cpg_handle_t /*handle*/,
- cpg_name* /*group*/,
+ const cpg_name* /*group*/,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len)
+ size_t msg_len)
{
MemberId from(nodeid, pid);
framing::Buffer buf(static_cast<char*>(msg), msg_len);
@@ -453,10 +453,10 @@
void Cluster::configChange (
cpg_handle_t /*handle*/,
- cpg_name */*group*/,
- cpg_address *current, int nCurrent,
- cpg_address *left, int nLeft,
- cpg_address */*joined*/, int /*nJoined*/)
+ const cpg_name */*group*/,
+ const cpg_address *current, size_t nCurrent,
+ const cpg_address *left, size_t nLeft,
+ const cpg_address */*joined*/, size_t /*nJoined*/)
{
Mutex::ScopedLock l(lock);
if (state == INIT) { // First config change.
@@ -467,7 +467,7 @@
QPID_LOG(debug, *this << " config change: " << AddrList(current, nCurrent)
<< AddrList(left, nLeft, "left: "));
std::string addresses;
- for (cpg_address* p = current; p < current+nCurrent; ++p)
+ for (const cpg_address* p = current; p < current+nCurrent; ++p)
addresses.append(MemberId(*p).str());
deliverEvent(Event::control(ClusterConfigChangeBody(ProtocolVersion(), addresses), self));
}
Only in qpidc-0.5.788782.new/src/qpid/cluster: Cluster.cpp.orig
diff -U3 -r qpidc-0.5.788782/src/qpid/cluster/Cluster.h qpidc-0.5.788782.new/src/qpid/cluster/Cluster.h
--- qpidc-0.5.788782/src/qpid/cluster/Cluster.h 2009-06-18 17:25:00.000000000 -0400
+++ qpidc-0.5.788782.new/src/qpid/cluster/Cluster.h 2009-06-29 14:02:02.982566348 -0400
@@ -159,20 +159,20 @@
// == Called in CPG dispatch thread
void deliver( // CPG deliver callback.
cpg_handle_t /*handle*/,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t /*nodeid*/,
uint32_t /*pid*/,
void* /*msg*/,
- int /*msg_len*/);
+ size_t /*msg_len*/);
void deliverEvent(const Event&);
void configChange( // CPG config change callback.
cpg_handle_t /*handle*/,
- struct cpg_name */*group*/,
- struct cpg_address */*members*/, int /*nMembers*/,
- struct cpg_address */*left*/, int /*nLeft*/,
- struct cpg_address */*joined*/, int /*nJoined*/
+ const struct cpg_name */*group*/,
+ const struct cpg_address */*members*/, size_t /*nMembers*/,
+ const struct cpg_address */*left*/, size_t /*nLeft*/,
+ const struct cpg_address */*joined*/, size_t /*nJoined*/
);
// == Called in management threads.
Only in qpidc-0.5.788782.new/src/qpid/cluster: Cluster.h.orig
diff -U3 -r qpidc-0.5.788782/src/qpid/cluster/Cpg.cpp qpidc-0.5.788782.new/src/qpid/cluster/Cpg.cpp
--- qpidc-0.5.788782/src/qpid/cluster/Cpg.cpp 2009-06-18 12:22:19.000000000 -0400
+++ qpidc-0.5.788782.new/src/qpid/cluster/Cpg.cpp 2009-06-29 14:02:02.983566410 -0400
@@ -44,21 +44,21 @@
// Global callback functions.
void Cpg::globalDeliver (
cpg_handle_t handle,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len)
+ size_t msg_len)
{
cpgFromHandle(handle)->handler.deliver(handle, group, nodeid, pid, msg, msg_len);
}
void Cpg::globalConfigChange(
cpg_handle_t handle,
- struct cpg_name *group,
- struct cpg_address *members, int nMembers,
- struct cpg_address *left, int nLeft,
- struct cpg_address *joined, int nJoined
+ const struct cpg_name *group,
+ const struct cpg_address *members, size_t nMembers,
+ const struct cpg_address *left, size_t nLeft,
+ const struct cpg_address *joined, size_t nJoined
)
{
cpgFromHandle(handle)->handler.configChange(handle, group, members, nMembers, left, nLeft, joined, nJoined);
diff -U3 -r qpidc-0.5.788782/src/qpid/cluster/Cpg.h qpidc-0.5.788782.new/src/qpid/cluster/Cpg.h
--- qpidc-0.5.788782/src/qpid/cluster/Cpg.h 2009-02-26 12:21:40.000000000 -0500
+++ qpidc-0.5.788782.new/src/qpid/cluster/Cpg.h 2009-06-29 14:02:02.984566541 -0400
@@ -68,18 +68,18 @@
virtual ~Handler() {};
virtual void deliver(
cpg_handle_t /*handle*/,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t /*nodeid*/,
uint32_t /*pid*/,
void* /*msg*/,
- int /*msg_len*/) = 0;
+ size_t /*msg_len*/) = 0;
virtual void configChange(
cpg_handle_t /*handle*/,
- struct cpg_name */*group*/,
- struct cpg_address */*members*/, int /*nMembers*/,
- struct cpg_address */*left*/, int /*nLeft*/,
- struct cpg_address */*joined*/, int /*nJoined*/
+ const struct cpg_name */*group*/,
+ const struct cpg_address */*members*/, size_t /*nMembers*/,
+ const struct cpg_address */*left*/, size_t /*nLeft*/,
+ const struct cpg_address */*joined*/, size_t /*nJoined*/
) = 0;
};
@@ -128,18 +128,18 @@
static void globalDeliver(
cpg_handle_t handle,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len);
+ size_t msg_len);
static void globalConfigChange(
cpg_handle_t handle,
- struct cpg_name *group,
- struct cpg_address *members, int nMembers,
- struct cpg_address *left, int nLeft,
- struct cpg_address *joined, int nJoined
+ const struct cpg_name *group,
+ const struct cpg_address *members, size_t nMembers,
+ const struct cpg_address *left, size_t nLeft,
+ const struct cpg_address *joined, size_t nJoined
);
cpg_handle_t handle;
Index: qpidc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- qpidc.spec 2 Jul 2009 18:29:00 -0000 1.85
+++ qpidc.spec 31 Jul 2009 08:31:33 -0000 1.86
@@ -9,13 +9,14 @@
Name: qpidc
Version: 0.5.790661
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: ASL 2.0
URL: http://qpid.apache.org
Source0: %{name}-%{version}.tar.gz
Source1: qpidd.pp
+Patch1: qpidc_f12_new_cpg.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -36,8 +37,8 @@ BuildRequires: nss-devel
BuildRequires: nspr-devel
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
-BuildRequires: corosync-devel
-BuildRequires: cmanlib-devel
+BuildRequires: corosynclib-devel >= 1.0.0-1
+BuildRequires: clusterlib-devel >= 3.0.0-20
BuildRequires: swig
Requires: boost
@@ -187,8 +188,8 @@ Summary: Cluster support for the Qpid da
Group: System Environment/Daemons
Requires: qpidd = %version-%release
Requires: qpidc = %version-%release
-Requires: corosync
-Requires: cmanlib
+Requires: corosync >= 1.0.0-1
+Requires: clusterlib >= 3.0.0-20
%description -n qpidd-cluster
A Qpid daemon plugin enabling broker clustering using openais
@@ -210,9 +211,9 @@ exit 0
%prep
%setup -q
+%patch1 -p1
-%define perftests "perftest topic_listener topic_publisher \
- latencytest client_test txtest"
+%define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
install -d selinux
install %{SOURCE1} selinux
@@ -437,6 +438,13 @@ fi
%postun -n qmf -p /sbin/ldconfig
%changelog
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-2
+- Update BuildRequires and Requires to use latest stable versions of
+ corosync and clusterlib.
+- Sync spec file changelog from F-11.
+- Unbreak perftests define (and fix vim spec syntax coloring).
+- Apply qpidc_f12_new_cpg.diff from rawhide.
+
* Thu Jul 2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.790661-1
- Rebased to svn rev 790661; .so lib numbers bumped
@@ -446,9 +454,22 @@ fi
* Mon Jun 22 2009 Nuno Santos <nsantos at redhat.com> - 0.5.787286-1
- Rebased to svn rev 787286
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.752600-8
+- update BuildRequires to use corosynclib-devel in correct version.
+- update BuildRequires to use clusterlib-devel instead of the obsoleted
+ cmanlib-devel.
+- drop Requires on cmanlib. This should come in automatically as part
+ of the rpm build process.
+- re-align package version to -8. -7 didn't have a changelog entry?
+- add patch to port Cluster/Cpg to newest Cpg code.
+- change patch tag to use patch0.
+
* Mon May 4 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-5
- patch for SASL credentials refresh
+* Wed Apr 1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.752600-5
+- Fix unowned examples directory in -devel pkg.
+
* Mon Mar 16 2009 Nuno Santos <nsantos at localhost.localdomain> - 0.5.752600-4
- BZ483925 - split docs into a separate noarch subpackage
--- examples.patch DELETED ---
- Previous message (by thread): rpms/resource-agents/F-10 resource-agents.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/gdb/devel gdb-readline-6.0.patch, NONE, 1.1 gdb-orphanripper.c, 1.2, 1.3 gdb.spec, 1.365, 1.366
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list