From bbe1b81942872deb0555864292cd98fadb5ae9e0 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Fri, 25 Sep 2009 09:52:16 +0000
Subject: [PATCH] New upstream release, enable InfiniBand support

---
 .cvsignore    |  2 +-
 corosync.spec | 19 +++++++++++++++++--
 sources       |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6002f7b..87cccb0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-corosync-1.0.1.tar.gz
+corosync-1.1.0.tar.gz
diff --git a/corosync.spec b/corosync.spec
index aca686d..1f30c3c 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
 BuildRequires: autoconf automake
 %endif
 BuildRequires: nss-devel
+BuildRequires: libibverbs-devel librdmacm-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,7 +35,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ./autogen.sh
 %endif
 
-%{configure}
+export ibverbs_CFLAGS=-I/usr/include/infiniband \
+export ibverbs_LIBS=-libverbs \
+export rdmacm_CFLAGS=-I/usr/include/rdma \
+export rdmacm_LIBS=-lrdmacm \
+%{configure} \
+	--enable-nss \
+	--enable-rdma
 
 %build
 make %{_smp_mflags}
@@ -80,6 +87,8 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
+%{_sbindir}/corosync-cpgtool
+%{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
@@ -199,6 +208,12 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.1.0-1
+- New upstream release
+- spec file updates:
+  * enable IB support
+  * explicitly define built-in features at configure time
+
 * Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.0.1-1
 - New upstream release
 - spec file updates:
diff --git a/sources b/sources
index 9848fdb..84a3599 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75fe306a8e23c31a3b0a42798e01e466  corosync-1.0.1.tar.gz
+f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz