From 8f2f3ecb4404cce1c841b0332a5258792851daee Mon Sep 17 00:00:00 2001
From: Doug Ledford <dledford@fedoraproject.org>
Date: Fri, 4 Aug 2006 22:16:14 +0000
Subject: [PATCH] Update to 1.1, add IB support

---
 .cvsignore   |  1 +
 openmpi.spec | 19 ++++++++++++-------
 sources      |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6ae455d..2fd7194 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 openmpi-1.0.1.tar.bz2
 openmpi-1.0.2.tar.bz2
+openmpi-1.1.tar.bz2
diff --git a/openmpi.spec b/openmpi.spec
index 76a089d..892e419 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -1,19 +1,18 @@
-%{?!dist:       %define dist .fc6}
 Name:           openmpi
-Version:        1.0.2
+Version:        1.1
 Release:        1%{dist}
 Summary:        Open Message Passing Interface
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.open-mpi.org/
-Source0:       	http://www.open-mpi.org/software/ompi/v1.0/downloads/%{name}-%{version}.tar.bz2
+Source0:       	http://www.open-mpi.org/software/ompi/v1.1/downloads/%{name}-%{version}.tar.bz2
 Source1:	relpath.sh
 Source2:	openmpi.pc.in
 Source3:	mpi_alternatives.in
 Source4:	openmpi.module.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gcc-gfortran, autoconf, automake, libtool
+BuildRequires:  gcc-g77, autoconf, automake, libtool, libibverbs-devel, opensm-devel
 Requires(post): /sbin/ldconfig
 
 %package devel
@@ -51,6 +50,8 @@ XFFLAGS="$RPM_OPT_FLAGS -fPIC"
 	--includedir=%{_includedir}/%{name} \
 	--libdir=%{_libdir}/%{name} \
 	--datadir=%{_datadir}/%{name}/help \
+	--mandir=%{_datadir}/%{name}/man \
+	--with-openib=/usr \
 	LDFLAGS='-Wl,-z,noexecstack' \
 	CFLAGS="$CFLAGS $XCFLAGS" \
 	CXXFLAGS="$CFLAGS $XCFLAGS" \
@@ -138,7 +139,7 @@ fi;
 %ghost  %{_sysconfdir}/ld.so.conf.d/mpi.conf
 %config %{_sysconfdir}/openmpi-*
 %{_bindir}/orte*
-%{_bindir}/*run
+#%{_bindir}/*run
 %{_bindir}/*exec
 %{_bindir}/*info
 %{_sbindir}/mpi_alternatives
@@ -146,7 +147,7 @@ fi;
 %dir %{_libdir}/%{name}/%{name}
 %{_libdir}/%{name}/*.so.*
 %{_libdir}/%{name}/%{name}/*.so
-%{_libdir}/%{name}/*.mod
+#%{_libdir}/%{name}/*.mod
 %{_datadir}/%{name}/bin
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/man
@@ -164,12 +165,16 @@ fi;
 %{_includedir}/*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/*.a
+# %{_libdir}/%{name}/*.a
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/%{name}/include
 
 
 %changelog
+* Wed Aug  2 2006 Doug Ledford <dledford@redhat.com> - 1.1-1
+- Upgrade to 1.1
+- Build with Infiniband support via openib
+
 * Mon Jun 12 2006 Jason Vas Dias <jvdias@redhat.com> - 1.0.2-1
 - Upgrade to 1.0.2
 
diff --git a/sources b/sources
index f74995d..1c64070 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 fd32861d643f9fe539a01d0d5b836f41  openmpi-1.0.2.tar.bz2
+821af8bbb7a8e85ec707cb4c3b6bcbf6  openmpi-1.1.tar.bz2