From e941c88664448414febcd9b93eccc9a21a94b4cd Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 16 Mar 2015 10:17:47 -0600
Subject: [PATCH] Own and ship pkgconfig files, set PKG_CONFIG_PATH in
 modulefile (bug #1113626)

- Drop old configure settings
---
 openmpi.module.in |  1 +
 openmpi.spec      | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openmpi.module.in b/openmpi.module.in
index 3f40823..60c11bb 100644
--- a/openmpi.module.in
+++ b/openmpi.module.in
@@ -5,6 +5,7 @@
 conflict		mpi
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
+prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
 prepend-path		PYTHONPATH	@PYSITEARCH@
 prepend-path		MANPATH		@MANDIR@
 setenv 			MPI_BIN		@LIBDIR@/bin
diff --git a/openmpi.spec b/openmpi.spec
index 62749df..aeb0e16 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.8.4
-Release:		3.20150228gitgd83fb30%{?dist}
+Release:		4.20150228gitgd83fb30%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -127,7 +127,6 @@ rm -r opal/libltdl
 	--sysconfdir=%{_sysconfdir}/%{namearch} \
 	--disable-silent-rules \
 	--enable-mpi-java \
-	--enable-opal-multi-threads \
 	--with-libevent=/usr \
 	--with-verbs=/usr \
 	--with-sge \
@@ -141,14 +140,12 @@ rm -r opal/libltdl
 	LDFLAGS='%{__global_ldflags}' \
 	CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
 	CXXFLAGS="%{?opt_cxxflags} %{!?opt_cxxflags:$RPM_OPT_FLAGS}" \
-	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}" \
-	F77=%{opt_f77} FFLAGS="%{?opt_fflags} %{!?opt_fflags:$RPM_OPT_FLAGS}"
+	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}"
 
 make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=%{buildroot}
-rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig
 find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
 find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9
 ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
@@ -222,6 +219,7 @@ make check
 %{_libdir}/%{name}/lib/*.so
 %{_libdir}/%{name}/lib/lib*.a
 %{_libdir}/%{name}/lib/*.mod
+%{_libdir}/%{name}/lib/pkgconfig/
 %{_mandir}/%{namearch}/man1/mpi[cCf]*
 %{_mandir}/%{namearch}/man1/opal_*
 %{_mandir}/%{namearch}/man3/*
@@ -243,6 +241,10 @@ make check
 
 
 %changelog
+* Mon Mar 16 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.4-4.99.20150228gitgd83fb30
+- Own and ship pkgconfig files, set PKG_CONFIG_PATH in modulefile (bug #1113626)
+- Drop old configure settings
+
 * Wed Mar 4 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.4-3.99.20150228gitgd83fb30
 - Update to 1.8.4.99 snapshot