[mpich2] Fix location of module file.
Jussi Lehtola
jussilehtola at fedoraproject.org
Wed Aug 3 12:44:17 UTC 2011
commit af1ebab2a05e34feddbd8019654d9d6ccae43045
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Wed Aug 3 15:44:01 2011 +0300
Fix location of module file.
mpich2.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/mpich2.spec b/mpich2.spec
index 44e621c..8193741 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -3,7 +3,7 @@
Summary: A high-performance implementation of MPI
Name: mpich2
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: Development/Libraries
URL: http://www.mcs.anl.gov/research/projects/mpich2
@@ -165,10 +165,10 @@ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
#mv %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
# Install the module file
-mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
mkdir -p %{buildroot}%{python_sitearch}/%{name}
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
-sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
+sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich2-%{_arch}.sh
@@ -235,7 +235,7 @@ fi
%dir %{python_sitearch}/%{name}
%dir %{_mandir}/%{name}
%doc %{_mandir}/%{name}/man1/
-%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+%{_sysconfdir}/modulefiles/%{name}-%{_arch}
%{_sysconfdir}/profile.d/mpich2-%{_arch}.*
%exclude %{_libdir}/%{name}/bin/*log*
%exclude %{_libdir}/%{name}/bin/jumpshot
@@ -272,6 +272,9 @@ fi
%exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
%changelog
+* Wed Aug 03 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4-2
+- Respect environment module guidelines wrt placement of module file.
+
* Fri Jun 17 2011 Deji Akingunola <dakingun at gmail.com> - 1.4-1
- Update to 1.4 final
More information about the scm-commits
mailing list