rpms/blacs/F-13 blacs.spec,1.37,1.38

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/blacs/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17710/F-13

Modified Files:
	blacs.spec 
Log Message:
fix blacs-openmpi, inherit other cleanups from rawhide


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-13/blacs.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- blacs.spec	19 Feb 2010 21:57:17 -0000	1.37
+++ blacs.spec	13 Apr 2010 12:41:31 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 37%{?dist}
+Release: 39%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -126,6 +126,9 @@ for i in mpich2 openmpi; do
 	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
 done
 
+# openmpi doesn't use TRANSCOMM = -DUseMpich
+sed -i "s|-DUseMpich||g" BLACS-openmpi/Bmake.inc
+
 # copy in docs:
 cp -p %{SOURCE2} mpi_prop.ps
 cp -p %{SOURCE3} blacs_install.ps
@@ -166,33 +169,23 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
 for i in mpich2 openmpi; do 
-  mkdir -p %{buildroot}%{_libdir}/$i/
+  mkdir -p %{buildroot}%{_libdir}/$i/lib/
   mkdir -p %{buildroot}%{_includedir}/$i-%{_arch}/
   mkdir -p %{buildroot}%{_includedir}/blacs/
   pushd BLACS-$i/LIB
   for f in *.a *.so*; do
-    cp -f $f %{buildroot}%{_libdir}/$i/$f
+    cp -f $f %{buildroot}%{_libdir}/$i/lib/$f
   done
   popd
   # This file is independent of the MPI compiler used, but it is poorly named
   # So we'll put it in %{_includedir}/blacs/
   install -p BLACS-$i/SRC/MPI/Bdef.h %{buildroot}%{_includedir}/blacs/
-  pushd %{buildroot}%{_libdir}/$i/
+  pushd %{buildroot}%{_libdir}/$i/lib/
   for l in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
     ln -fs $l.so.1.0.0 $l.so.1
     ln -s $l.so.1.0.0 $l.so
   done
   popd
-# Generate environment module file
-mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/
-cat << EOF > %{buildroot}%{_sysconfdir}/modulefiles/blacs-$i-%{_arch}
-#%Module 1.0
-#
-#  Blacs libraries compiled with $i support
-#
-prepend-path		LD_LIBRARY_PATH		%{_libdir}/$i
-setenv			LDFLAGS			-L%{_libdir}/$i
-EOF
 done
 
 # cd ../TESTING/EXE
@@ -209,33 +202,38 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files mpich2
 %defattr(-,root,root,0755)
-%{_sysconfdir}/modulefiles/blacs-mpich2-%{_arch}
-%{_libdir}/mpich2/*.so.*
+%{_libdir}/mpich2/lib/*.so.*
 
 %files mpich2-devel
 %defattr(-,root,root,0755)
 %{_includedir}/mpich2-%{_arch}/
-%{_libdir}/mpich2/*.so
+%{_libdir}/mpich2/lib/*.so
 
 %files mpich2-static
 %defattr(-,root,root,0755)
-%{_libdir}/mpich2/*.a
+%{_libdir}/mpich2/lib/*.a
 
 %files openmpi
 %defattr(-,root,root,0755)
-%{_sysconfdir}/modulefiles/blacs-openmpi-%{_arch}
-%{_libdir}/openmpi/*.so.*
+%{_libdir}/openmpi/lib/*.so.*
 
 %files openmpi-devel
 %defattr(-,root,root,0755)
 %{_includedir}/openmpi-%{_arch}/
-%{_libdir}/openmpi/*.so
+%{_libdir}/openmpi/lib/*.so
 
 %files openmpi-static
 %defattr(-,root,root,0755)
-%{_libdir}/openmpi/*.a
+%{_libdir}/openmpi/lib/*.a
 
 %changelog
+* Tue Apr 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-39
+- openmpi doesn't use TRANSCOMM	= -DUseMpich
+- put libraries in $MPI_LIB, not $MPI_HOME
+
+* Wed Feb 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-38
+- get rid of environment module files altogether (the openmpi/mpich2 env modules are sufficient)
+
 * Fri Feb 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-37
 - fix environment module files