From 06802d234e54407f82976cc6ac10250945de9336 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Jul 22 2009 21:30:45 +0000 Subject: Fix build in rawhide. --- diff --git a/pypar.spec b/pypar.spec index 2d5e170..075ee30 100644 --- a/pypar.spec +++ b/pypar.spec @@ -2,7 +2,7 @@ Name: pypar Version: 2.1.0_66 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel programming with Python Group: Development/Libraries License: GPLv2+ @@ -12,11 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: numpy BuildRequires: python-setuptools-devel -%if 0%{?fedora} > 11 -BuildRequires: openmpi -%else BuildRequires: openmpi-devel -%endif Requires: numpy @@ -57,8 +53,12 @@ standard MPI. # Load MPI enviroment %if %modules == 1 . /etc/profile.d/modules.sh +%if 0%{?fedora} < 12 module load %{_libdir}/openmpi/*/openmpi.module -export CFLAGS="%{optflags}" +%else +module load openmpi-%{_arch} +%endif +export CFLAGS="$CFLAGS %{optflags}" %endif %if %selector == 1 @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{python_sitearch}/Pypar*.egg-info %changelog +* Thu Jul 23 2009 Jussi Lehtola - 2.1.0_66-4 +- Openmpi seems to have been fixed, fix build in rawhide. + * Thu Jun 04 2009 Jussi Lehtola - 2.1.0_66-3 - Fix build in rawhide.