rpms/lam/F-10 lam.spec,1.49,1.50

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/lam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2307

Modified Files:
	lam.spec 
Log Message:
* Wed May 20 2009 Doug Ledford <dledford at redhat.com> - 2:7.1.4-7
- Lam build is not smp safe



Index: lam.spec
===================================================================
RCS file: /cvs/extras/rpms/lam/F-10/lam.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- lam.spec	20 May 2009 17:03:30 -0000	1.49
+++ lam.spec	20 May 2009 19:00:26 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: The Local Area Multicomputer programming environment
 Name: lam
 Version: 7.1.4
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: BSD
 Epoch: 2
 Group: System/Base
@@ -61,6 +61,7 @@ libtoolize
 autoreconf
 
 %build
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %ifarch x86_64
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -94,7 +95,8 @@ export FC=f95
 ./configure --with-rsh="/usr/bin/ssh -x -a" --prefix=%{mpidir} --exec-prefix=%{mpidir} --datadir=%{mpidir} --mandir=%{mpidir}/man --sysconfdir=%{_sysconfdir} --disable-tv --disable-tv-dll --with-trillium --enable-shared --disable-deprecated-executable-names --disable-dependency-tracking
 %endif
 
-make %{?_smp_mflags} all
+# Lam build is not smp safe
+make all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -117,7 +119,7 @@ rm -rf ${RPM_BUILD_ROOT}%{mpidir}/lam
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
 sed 's#@VERSION@#'%{version}'#g;s#@LAMDIR@#'%{mpidir}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Modules/modulefiles
-sed 's#@LAMDIR@#'%{mpidir}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}.module
+sed 's#@LAMDIR@#'%{mpidir}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
 
 for i in hcc hcp hf77
 do
@@ -201,6 +203,14 @@ fi
 %{mpidir}/man/man[23]/*
 
 %changelog
+* Wed May 20 2009 Doug Ledford <dledford at redhat.com> - 2:7.1.4-7
+- Lam build is not smp safe
+
+* Wed May 20 2009 Doug Ledford <dledford at redhat.com> - 2:7.1.4-6
+- Pass -fno-strict-aliasing to gcc to prevent build error on ppc64
+- Don't put .module on the end of our module file now that it's in the 
+  default module path
+
 * Wed May 20 2009 Doug Ledford <dledford at redhat.com> - 2:7.1.4-5
 - Fix an rpmlint issue (tabs versus spaces)
 - Correct a missing Requires(post) chkconfig (for /usr/sbin/alternatives)