rpms/qpidc/devel qpidc.spec, 1.88, 1.89 qpidc_f12_new_cpg.diff, 1.1, 1.2

[Nuno Santos]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29226

Modified Files:
	qpidc.spec qpidc_f12_new_cpg.diff 
Log Message:
Rebased to svn rev 788782


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- qpidc.spec	29 Jun 2009 17:26:05 -0000	1.88
+++ qpidc.spec	29 Jun 2009 18:06:52 -0000	1.89
@@ -16,6 +16,7 @@ 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
@@ -210,6 +211,7 @@ exit 0
 
 %prep
 %setup -q
+%patch1 -p1
 
 %define perftests "perftest topic_listener topic_publisher \
 	latencytest client_test txtest"

qpidc_f12_new_cpg.diff:

Index: qpidc_f12_new_cpg.diff
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc_f12_new_cpg.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qpidc_f12_new_cpg.diff	17 Jun 2009 18:08:28 -0000	1.1
+++ qpidc_f12_new_cpg.diff	29 Jun 2009 18:06:52 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cluster.cpp qpidc-0.5.752600/src/qpid/cluster/Cluster.cpp
---- qpidc-0.5.752600.old/src/qpid/cluster/Cluster.cpp	2009-03-09 18:03:40.000000000 +0100
-+++ qpidc-0.5.752600/src/qpid/cluster/Cluster.cpp	2009-06-10 13:59:12.000000000 +0200
-@@ -209,11 +209,11 @@
+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*/,
@@ -15,7 +15,7 @@ diff -Naurd qpidc-0.5.752600.old/src/qpi
  {
      MemberId from(nodeid, pid);
      framing::Buffer buf(static_cast<char*>(msg), msg_len);
-@@ -331,10 +331,10 @@
+@@ -453,10 +453,10 @@
  
  void Cluster::configChange ( 
      cpg_handle_t /*handle*/,
@@ -30,19 +30,20 @@ diff -Naurd qpidc-0.5.752600.old/src/qpi
  {
      Mutex::ScopedLock l(lock);
      if (state == INIT) {        // First config change.
-@@ -345,7 +345,7 @@
-     QPID_LOG(debug, *this << " config change: " << AddrList(current, nCurrent) 
-              << AddrList(left, nLeft, "( ", ")"));
+@@ -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));
  }
-diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cluster.h qpidc-0.5.752600/src/qpid/cluster/Cluster.h
---- qpidc-0.5.752600.old/src/qpid/cluster/Cluster.h	2009-03-09 18:03:40.000000000 +0100
-+++ qpidc-0.5.752600/src/qpid/cluster/Cluster.h	2009-06-10 13:59:41.000000000 +0200
-@@ -153,20 +153,20 @@
+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*/,
@@ -69,9 +70,10 @@ diff -Naurd qpidc-0.5.752600.old/src/qpi
      );
  
      // == Called in management threads.
-diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cpg.cpp qpidc-0.5.752600/src/qpid/cluster/Cpg.cpp
---- qpidc-0.5.752600.old/src/qpid/cluster/Cpg.cpp	2009-03-11 21:03:45.000000000 +0100
-+++ qpidc-0.5.752600/src/qpid/cluster/Cpg.cpp	2009-06-10 13:46:04.000000000 +0200
+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 (
@@ -100,9 +102,9 @@ diff -Naurd qpidc-0.5.752600.old/src/qpi
  )
  {
      cpgFromHandle(handle)->handler.configChange(handle, group, members, nMembers, left, nLeft, joined, nJoined);
-diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cpg.h qpidc-0.5.752600/src/qpid/cluster/Cpg.h
---- qpidc-0.5.752600.old/src/qpid/cluster/Cpg.h	2009-02-26 18:21:40.000000000 +0100
-+++ qpidc-0.5.752600/src/qpid/cluster/Cpg.h	2009-06-10 13:59:47.000000000 +0200
+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(