Fix changelog version

Conflicts:
	openmpi.spec

openmpi.spec

@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.8.8
-Release:		5%{?dist}
+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
@@ -168,7 +171,14 @@ sed 's#@LIBDIR@#%{_libdir}/%{name}#;
 
 # make the rpm config file
 install -Dpm 644 %{SOURCE4} %{buildroot}/%{macrosdir}/macros.%{namearch}
+
+# Link the fortran module to proper location
 mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+for mod in %{buildroot}%{_libdir}/%{name}/lib/*.mod
+do
+  modname=$(basename $mod)
+  ln -s ../../../%{name}/lib/${modname} %{buildroot}/%{_fmoddir}/%{name}/
+done
 
 # Remove extraneous wrapper link libraries (bug 814798)
 sed -i -e s/-ldl// -e s/-lhwloc// \
@@ -191,7 +201,6 @@ make check
 %dir %{_libdir}/%{name}/lib/openmpi
 %dir %{_mandir}/%{namearch}
 %dir %{_mandir}/%{namearch}/man*
-%dir %{_fmoddir}/%{name}
 %dir %{python2_sitearch}/%{name}
 %{python2_sitearch}/openmpi.pth
 %dir %{python3_sitearch}/%{name}
@@ -232,6 +241,7 @@ make check
 %{_libdir}/%{name}/bin/shmem[cf]*
 %{_libdir}/%{name}/bin/vt*
 %{_includedir}/%{namearch}/*
+%{_fmoddir}/%{name}/
 %{_libdir}/%{name}/lib/*.so
 %{_libdir}/%{name}/lib/lib*.a
 %{_libdir}/%{name}/lib/*.mod
@@ -257,10 +267,16 @@ make check
 
 
 %changelog
+* Fri Jun 24 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.8-5.2
+- Use bundled libevent, system version causes issues (bug #1235044)
+
+* Tue Dec 29 2015 Orion Poplawski <orion@cora.nwra.com> - 1.8.8-5.1
+- Fixup fortran module install (bug #1154982)
+
 * Thu Aug 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.8-5
 - Use .pth files to set the python path (https://fedorahosted.org/fpc/ticket/563)
 
-* Mon Aug 23 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.8-4
+* Mon Aug 24 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.8-4
 - Disable valgrind only on s390
 
 * Mon Aug 17 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.8-3