rpms/pypar/devel pypar.spec,1.1,1.2

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/pypar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15748

Modified Files:
	pypar.spec 
Log Message:
Fix build in rawhide.


Index: pypar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/devel/pypar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pypar.spec	4 Jun 2009 17:19:41 -0000	1.1
+++ pypar.spec	22 Jul 2009 21:30:45 -0000	1.2
@@ -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
 
 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 <jussi.lehtola at iki.fi> - 2.1.0_66-4
+- Openmpi seems to have been fixed, fix build in rawhide.
+
 * Thu Jun 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-3
 - Fix build in rawhide.