From 96a9fedebb4a62f86e9e2ddf695827f026e4c3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 16 Nov 2015 11:24:53 -0500
Subject: [PATCH] Move fortran .mod files to %{_fmoddir}/mpich

---
 mpich-modules.patch |  2 +-
 mpich.spec          | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/mpich-modules.patch b/mpich-modules.patch
index fc9e688..4b786b9 100644
--- a/mpich-modules.patch
+++ b/mpich-modules.patch
@@ -12,7 +12,7 @@
 -setenv        exec_prefix   @exec_prefix@
 +setenv        MPI_BIN       @LIBDIR@/bin
 +setenv        MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@
-+setenv        MPI_FORTRAN_MOD_DIR @includedir@
++setenv        MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@-@ARCH@
 +setenv        MPI_INCLUDE   @includedir@
 +setenv        MPI_LIB       @libdir@
 +setenv        MPI_MAN       @mandir@
diff --git a/mpich.spec b/mpich.spec
index 9f4ba51..b5b4614 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich
 Version:	3.1.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mpich.org/
@@ -162,24 +162,26 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags} VERBOSE=1
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 
-#mkdir -p %{buildroot}/%{_fmoddir}/%{name}
-#mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
+mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+mv  %{buildroot}%{_includedir}/%{name}-*/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
 # Install the module file
 mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
-sed 's#%{_bindir}#%{_libdir}/%{name}/bin#;
-     s#@LIBDIR@#%{_libdir}/%{name}#;
-     s#@MPINAME@#%{name}#;
-     s#@py2sitearch@#%{python2_sitearch}#;
-     s#@py3sitearch@#%{python3_sitearch}#;
-     s#@ARCH@#%{_arch}#' \
+sed -r 's|%{_bindir}|%{_libdir}/%{name}/bin|;
+        s|@LIBDIR@|%{_libdir}/%{name}|;
+        s|@MPINAME@|%{name}|;
+        s|@py2sitearch@|%{python2_sitearch}|;
+        s|@py3sitearch@|%{python3_sitearch}|;
+        s|@ARCH@|%{_arch}|;
+        s|@fortranmoddir@|%{_fmoddir}|;
+     ' \
      <src/packaging/envmods/mpich.module \
      >%{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh
+cat >%{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh <<EOF
 # Load mpich environment module
 module load mpi/%{name}-%{_arch}
 EOF
@@ -225,8 +227,8 @@ make check VERBOSE=1
 %files devel
 %{_includedir}/%{name}-%{_arch}/
 %{_libdir}/%{name}/lib/pkgconfig/
-##%%{_fmoddir}/%%{name}/
 %{_libdir}/%{name}/lib/*.so
+%{_fmoddir}/%{name}/
 %{_rpmconfigdir}/macros.d/macros.%{name}
 
 %files doc
@@ -235,6 +237,9 @@ make check VERBOSE=1
 %{_mandir}/%{name}/man3/
 
 %changelog
+* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-8
+- Move fortran .mod files to %%{_fmoddir}/mpich (#1154991)
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5