Update to fix licencing and packaging issues. Add prepend-path PYTHONPATH

to the module.in file.

.cvsignore

@@ -1 +1 @@
-openmpi-1.4.1.tar.bz2
+openmpi-1.4.1-RH.tar.bz2

openmpi.module.in

@@ -4,6 +4,7 @@
 # 
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
+prepend-path		PYTHONPATH	@PYSITEARCH@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
 setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@

openmpi.spec

@@ -19,20 +19,28 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.4.1
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
-License:		BSD
+License:		BSD, MIT and Romio
 URL:			http://www.open-mpi.org/
 # We can't use %{name} here because of _cc_name_suffix
-Source0:		http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-%{version}.tar.bz2
+#Source0:		http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-%{version}.tar.bz2
+# openmpi-1.4.1-RH.tar.bz2 was generated by taking the upstream 1.4.1 tarball
+# and removing license-incompatible (ras_loadleveler_module.c contained
+# usage requirements that we cannot make our users comply with, and
+# MoreDebugging/* is AML but unused in our configuration),
+# and packaging-guidelines-incompatable (MUST use system versions of libltdl
+# and libplpa, not the (formerly included ones), and also remove the generated
+# Makefile.in and configure related files.
+Source0:		openmpi-%{version}-RH.tar.bz2
 Source1:		openmpi.module.in
 Source2:		macros.openmpi
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		gcc-gfortran, libtool, numactl-devel, valgrind-devel
 BuildRequires:		libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0
 BuildRequires:		librdmacm librdmacm-devel libibcm libibcm-devel
-BuildRequires:		python
+BuildRequires:		python libtool-ltdl-devel plpa-devel
 #%ifnarch ppc
 #BuildRequires:		compat-dapl-devel
 #%endif
@@ -105,10 +113,11 @@ Contains development headers and libraries for openmpi
 
 %prep
 %setup -q -n openmpi-%{version}
+./autogen.sh
+%build
 %ifarch x86_64
 XFLAGS="-fPIC"
 %endif
-
 ./configure --prefix=%{_libdir}/%{name} --with-libnuma=/usr \
 	--with-openib=/usr \
 	--mandir=%{_mandir}/%{namearch} \
@@ -128,8 +137,6 @@ XFLAGS="-fPIC"
 	CXXFLAGS="%{?opt_cxxflags} $RPM_OPT_FLAGS $XFLAGS" \
 	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} $RPM_OPT_FLAGS $XFLAGS" \
 	F77=%{opt_f77} FFLAGS="%{?opt_fflags} $RPM_OPT_FLAGS $XFLAGS"
-
-%build
 make %{?_smp_mflags}
 
 %install
@@ -211,6 +218,12 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Mon Mar 29 2010 Jay Fenlason <fenlason@redhat.com> - 1.4.1-4
+- Update to fix licencing and packaging issues:
+  Use the system plpa and ltdl librarires rather than the ones in the tarball
+  Remove licence incompatible files from the tarball.
+- update module.in to prepend-path		PYTHONPATH
+
 * Tue Mar 9 2010 Jay Fenlason <fenlason@redhat.com> - 1.4.1-3
 - remove the pkgconfig file completely like we did in RHEL.
 

sources

@@ -1 +1 @@
-28a820c85e02973809df881fdeddd15e  openmpi-1.4.1.tar.bz2
+0a343ebe72050f6795a132a8d6df876e  openmpi-1.4.1-RH.tar.bz2