From 9edfa856fa764e3642b3f2fc5a59890190ccd10f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2016 15:03:29 -0600 Subject: [PATCH] Use bundled libevent, system version causes issues (bug #1235044) Conflicts: openmpi.spec --- openmpi.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 377d371..3a9959e 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -22,7 +22,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 1.8.8 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 Summary: Open Message Passing Interface Group: Development/Libraries License: BSD, MIT and Romio @@ -45,7 +45,6 @@ BuildRequires: hwloc-devel # So configure can find lstopo BuildRequires: hwloc BuildRequires: java-devel -BuildRequires: libevent-devel BuildRequires: papi-devel BuildRequires: perl(Getopt::Long) BuildRequires: python @@ -60,6 +59,11 @@ Requires: environment-modules # openmpi currently requires ssh to run # https://svn.open-mpi.org/trac/ompi/ticket/4228 Requires: openssh-clients +# We have problems using the system libevent - openmpi's is modified +# https://bugzilla.redhat.com/show_bug.cgi?id=1235044 +Provides: bundled(libevent) = 2.0.21 +# otf appears to be bundled +Provides: bundled(otf) = 1.12.3 # s390 is unlikely to have the hardware we want, and some of the -devel # packages we require aren't available there. @@ -124,7 +128,6 @@ Contains development wrapper for compiling Java with openmpi. --sysconfdir=%{_sysconfdir}/%{namearch} \ --disable-silent-rules \ --enable-mpi-java \ - --with-libevent=/usr \ --with-verbs=/usr \ --with-sge \ %ifnarch s390 @@ -264,6 +267,9 @@ make check %changelog +* Fri Jun 24 2016 Orion Poplawski - 1.10.3-2 +- Use bundled libevent, system version causes issues (bug #1235044) + * Tue Dec 29 2015 Orion Poplawski - 1.8.8-5.1 - Fixup fortran module install (bug #1154982)