From 257caf3e1d9b340bce7d958b884554a8f389fa7a Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Fri, 15 Jan 2010 22:54:56 +0000 Subject: [PATCH] - Fix an issue with usage of _cc_name_suffix that cause a broken define in our module file --- openmpi.module.in | 2 +- openmpi.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openmpi.module.in b/openmpi.module.in index 3fe3b4f..4fbf862 100644 --- a/openmpi.module.in +++ b/openmpi.module.in @@ -13,4 +13,4 @@ setenv MPI_MAN @MANDIR@ setenv MPI_PYTHON_SITEARCH @PYSITEARCH@ setenv MPI_COMPILER @COMPILER@ setenv MPI_SUFFIX @SUFFIX@ -setenv MPI_HOME @LIBDIR@@ +setenv MPI_HOME @LIBDIR@ diff --git a/openmpi.spec b/openmpi.spec index 8e1d690..dc33b6d 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -19,7 +19,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Message Passing Interface Group: Development/Libraries License: BSD @@ -150,7 +150,7 @@ sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{na # Make the environment-modules file mkdir -p %{buildroot}%{_sysconfdir}/modulefiles # Since we're doing our own substitution here, use our own definitions. -sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch} +sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch} # make the rpm config file mkdir -p %{buildroot}/%{_sysconfdir}/rpm cp %SOURCE3 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch} @@ -216,6 +216,10 @@ rm -rf %{buildroot} %{_sysconfdir}/rpm/macros.%{namearch} %changelog +* Fri Jan 15 2010 Doug Ledford - 1.4-4 +- Fix an issue with usage of _cc_name_suffix that cause a broken define in + our module file + * Fri Jan 15 2010 Doug Ledford - 1.4-3 - Fix pkgconfig file substitution - Bump version so we are later than the equivalent version from Red Hat