From da46e4ae7e650ef665681a110c786dde07bec8d6 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 25 May 2010 06:12:52 +0000
Subject: [PATCH] New upstream release

---
 .cvsignore          |  2 +-
 corosync.spec       | 10 ++++++----
 revision-2770.patch | 44 --------------------------------------------
 sources             |  2 +-
 4 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9b08e28..4c48ceb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-corosync-1.2.2.tar.gz
+corosync-1.2.3.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 33f334b..8ff4113 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -49,9 +49,7 @@ export rdmacm_LIBS=-lrdmacm \
 	--with-initddir=%{_initddir}
 
 %build
-make
-# 1.2.2 introduced problem where make -j fails.
-#make %{_smp_mflags}
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -216,6 +214,10 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue May 25 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.2.3-1
+- New upstream release
+- Rediff revision 2770 patch
+
 * Mon May 17 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.2.2-1
 - New upstream release
 - Add upstream trunk revision 2770 to add cpg_model_initialize api.
diff --git a/revision-2770.patch b/revision-2770.patch
index 08743a7..766c980 100644
--- a/revision-2770.patch
+++ b/revision-2770.patch
@@ -1,47 +1,3 @@
-Index: test/testcpg.c
-===================================================================
---- test/testcpg.c	(revision 2769)
-+++ test/testcpg.c	(revision 2770)
-@@ -132,9 +132,29 @@
- 	}
- }
- 
--static cpg_callbacks_t callbacks = {
-+static void TotemConfchgCallback (
-+	cpg_handle_t handle,
-+        struct cpg_ring_id ring_id,
-+        uint32_t member_list_entries,
-+        const uint32_t *member_list)
-+{
-+	int i;
-+
-+	printf("\nTotemConfchgCallback: ringid (%u.%llu)\n", ring_id.nodeid, ring_id.seq);
-+
-+	printf("active processors %lu: ",
-+	       (unsigned long int) member_list_entries);
-+	for (i=0; i<member_list_entries; i++) {
-+		printf("%d ", member_list[i]);
-+	}
-+	printf ("\n");
-+}
-+
-+static cpg_model_v1_data_t model_data = {
- 	.cpg_deliver_fn =            DeliverCallback,
- 	.cpg_confchg_fn =            ConfchgCallback,
-+	.cpg_totem_confchg_fn =      TotemConfchgCallback,
-+	.flags =                     CPG_MODEL_V1_DELIVER_INITIAL_TOTEM_CONF,
- };
- 
- static void sigintr_handler (int signum) __attribute__((__noreturn__));
-@@ -170,7 +190,7 @@
- 		group_name.length = 6;
- 	}
- 
--	result = cpg_initialize (&handle, &callbacks);
-+	result = cpg_model_initialize (&handle, CPG_MODEL_V1, (cpg_model_data_t *)&model_data, NULL);
- 	if (result != CS_OK) {
- 		printf ("Could not initialize Cluster Process Group API instance error %d\n", result);
- 		exit (1);
 Index: include/corosync/ipc_cpg.h
 ===================================================================
 --- include/corosync/ipc_cpg.h	(revision 2769)
diff --git a/sources b/sources
index 58b36ff..e99be3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e7c47fa7280f51418369fb2b7f3846e  corosync-1.2.2.tar.gz
+03b8cc311619c07ae1a84a5d59f13d0b  corosync-1.2.3.tar.gz