From 0ca3d5ccdc2f86ca13990c481ff1860d64b94459 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 15 Feb 2012 18:27:21 +0000 Subject: [PATCH] disable openmpi for ARM as we currently don't have it --- hdf5.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hdf5.spec b/hdf5.spec index 4243aef..23944e6 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -4,7 +4,7 @@ # You need to recompile all users of HDF5 for each version change Name: hdf5 Version: 1.8.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -16,7 +16,6 @@ Patch1: hdf5-1.8.8-tstlite.patch # Fix typo bug in parallel h5diff Patch3: hdf5-ph5diff.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time # Needed for mpi tests BuildRequires: openssh-clients @@ -29,7 +28,7 @@ BuildRequires: openssh-clients %global with_mpich2 0 %endif %endif -%ifarch s390 s390x +%ifarch s390 s390x %{arm} # No openmpi on s390(x) %global with_openmpi 0 %endif @@ -200,7 +199,6 @@ done %install -rm -rf $RPM_BUILD_ROOT make -C build install DESTDIR=${RPM_BUILD_ROOT} rm $RPM_BUILD_ROOT/%{_libdir}/*.la for mpi in %{mpi_list} @@ -263,10 +261,6 @@ do done -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -388,6 +382,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 15 2012 Peter Robinson - 1.8.8-8 +- disable openmpi for ARM as we currently don't have it + * Fri Feb 10 2012 Orion Poplawski 1.8.8-7 - Add patch to fix parallel mpi tests - Add patch to fix bug in parallel h5diff