From 740af39d0a2c6b6f2fa40b5b1b1c9cebc40be8df Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 3 May 2007 14:18:48 +0000 Subject: [PATCH] Bring over latest fixes from v1.2 branch. This commit was SVN r14577. --- contrib/dist/linux/openmpi.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/dist/linux/openmpi.spec b/contrib/dist/linux/openmpi.spec index 037e79387d..bfd312fe88 100644 --- a/contrib/dist/linux/openmpi.spec +++ b/contrib/dist/linux/openmpi.spec @@ -213,7 +213,7 @@ Summary: A powerful implementaion of MPI Name: %{?_name:%{_name}}%{!?_name:openmpi} Version: $VERSION -Release: 2 +Release: 1 License: BSD Group: Development/Libraries Source: openmpi-%{version}.tar.$EXTENSION @@ -406,7 +406,6 @@ CXXFLAGS="%{?cxxflags:%{cxxflags}}%{!?cxxflags:$RPM_OPT_FLAGS}" FFLAGS="%{?f77flags:%{f77flags}}%{!?f7flags:$RPM_OPT_FLAGS}" FCFLAGS="%{?fcflags:%{fcflags}}%{!?fcflags:$RPM_OPT_FLAGS}" export CFLAGS CXXFLAGS F77FLAGS FCFLAGS -echo ================================ DONE DONE DONE %configure %{configure_options} %{__make} %{?mflags} @@ -536,6 +535,10 @@ find $RPM_BUILD_ROOT -type f -o -type l | \ # ############################################################################# %clean +# We may be in the directory that we're about to remove, so cd out of +# there before we remove it +cd /tmp + # Remove installed driver after rpm build finished rm -rf $RPM_BUILD_DIR/%{name}-%{version} @@ -679,6 +682,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT # ############################################################################# %changelog +* Thu May 3 2007 Jeff Squyres +- Ensure to move out of $RPM_BUILD_ROOT before deleting it in % clean. +- Remove a debugging "echo" that somehow got left in there + * Thu Apr 12 2007 Jeff Squyres - Ensure that _pkglibdir is always defined, suggested by Greg Kurtzer.