[orsa/el6/master] Pull from master

[Lubomir Rintel]

commit 853fe505ce7ce845818be50a8c9f42c1a12bcf5a
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:13:07 2010 +0200

    Pull from master

 orsa.spec |   74 ++++++++----------------------------------------------------
 1 files changed, 10 insertions(+), 64 deletions(-)
---
diff --git a/orsa.spec b/orsa.spec
index 8e14150..7989f48 100644
--- a/orsa.spec
+++ b/orsa.spec
@@ -3,7 +3,7 @@
 
 Name:			orsa
 Version:		0.7.0
-Release:		11%{?dist}.1
+Release:		13%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -83,7 +83,7 @@ This package contains development files for a build of %{name}
 Summary:	A build of %{name} with support for MPICH2 MPI
 Group:		Applications/Engineering
 
-BuildRequires: mpich2-devel-static
+BuildRequires:	mpich2-devel-static
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	mpich2
 
@@ -101,28 +101,6 @@ Requires: %{name}-headers = %{version}-%{release}
 This package contains development files for a build of %{name}
 with support for MPICH2 MPI.
 
-%package lam
-Summary:	A build of %{name} with support for LAM MPI
-Group:		Applications/Engineering
-
-BuildRequires: lam-devel
-Requires:	%{name}-common = %{version}-%{release}
-Requires:	lam
-
-%description lam
-This package contains a build of %{name} with support for LAM MPI.
-
-%package lam-devel
-Summary:	Development files for %{name} build with support for LAM MPI
-Group:		Development/Libraries
-
-Requires: %{name}-lam = %{version}-%{release}
-Requires: %{name}-headers = %{version}-%{release}
-
-%description lam-devel
-This package contains development files for a build of %{name}
-with support for LAM MPI.
-
 %package headers
 Summary:	Headers for development with %{name}
 Group:		Development/Libraries
@@ -160,14 +138,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool ;\
 make %{?_smp_mflags} ; \
 cd ..
 
-# load the module function
-. /etc/profile.d/modules.sh
 %global OpenMPI_BIN %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_BIN)
 %global OpenMPI_LIB %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_LIB)
 %global mpich2dir %(. /etc/profile.d/modules.sh; module load mpich2-%{_arch}; echo $MPI_HOME)
-%global LAM_BIN %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_BIN | sed 's|-L||')
-%global LAM_LIB %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_LIB | sed 's|-L||')
-
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
 ################################
@@ -196,24 +169,10 @@ module load mpich2-%{_arch}
 WITH_MPI=--with-mpi %dobuild
 module unload mpich2-%{_arch}
 
-################################
-echo -e "\n##############################\nNow making the LAM version\n##############################\n"
-################################
-module load lam-%{_arch}
-export MPI_HOME=`echo $MPI_HOME | sed 's|-L||'`
-export MPI_BIN=`echo $MPI_BIN | sed 's|-L||'`
-export MPI_LIB=`echo $MPI_LIB | sed 's|-L||'`
-MPI_COMPILER=lam CC=mpic++ MPICXX=mpic++ WITH_MPI=--with-mpi MPI_SUFFIX=_lam %dobuild
-module unload lam-%{_arch}
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # we don't want to ship libtool archives:
 
-# load the module function
-. /etc/profile.d/modules.sh
-
 # Install serial version
 make -C serial install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
 rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la,libxorsa.la}
@@ -230,14 +189,6 @@ make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="
 rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
 module unload mpich2-%{_arch}
 
-# Install LAM version
-module load lam-%{_arch}
-MPI_COMPILER=lam
-MPI_LIB=`echo $MPI_LIB | sed 's|-L||'`
-make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
-rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
-module unload lam-%{_arch}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -279,24 +230,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{mpich2dir}/lib/*.so
 
-%files lam
-%defattr(-,root,root,-)
-%{LAM_LIB}/liborsa.so.*
-%{LAM_LIB}/libxorsa.so.*
-%{LAM_BIN}/*
-
-%files lam-devel
-%defattr(-,root,root,-)
-%{LAM_LIB}/*.so
-
 %files common
 %defattr(-,root,root,-)
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
-* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-11.1
-- Rebuild for mpich2 and BR mpich2-devel-static
-- Update the spec for changes in mpich2 packaging
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-13
+- No need to force mpicxx to be CC for mpich2 subpackage
+- BR mpich2-devel-static
+
+* Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-12
+- Rebuild for mpich2 
+- Remove the lam subpackage, lam is no more in Fedora
+- Clean-up the spec
 
 * Thu Aug 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-11
 - Make compliant to new MPI guidelines: