rpms/openmpi/FC-6 openmpi.spec,1.19,1.20

[fedora-cvs-commits at redhat.com]

Author: dledford

Update of /cvs/dist/rpms/openmpi/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30142

Modified Files:
	openmpi.spec 
Log Message:
And FC6


Index: openmpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openmpi/FC-6/openmpi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openmpi.spec	13 Oct 2006 12:59:32 -0000	1.19
+++ openmpi.spec	13 Oct 2006 18:27:51 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           openmpi
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Open Message Passing Interface
 
 Group:          Development/Libraries
@@ -124,10 +124,13 @@
   mv $i.out $i
 done
 # and we also need to force the compile mode via the wrapper-data.txt files
+# (except on ia64 where the -m64 flag is not allowed by gcc)
+%ifnarch ia64
 for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/*wrapper-data.txt; do
   sed -e 's#compiler_flags=#compiler_flags=-m'%{mode}' #' < $i > $i.out
   mv $i.out $i
 done
+%endif
 
 echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
 # Make the pkgconfig files
@@ -215,6 +218,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Doug Ledford <dledford at redhat.com> - 1.1-7
+- ia64 can't take -m64 on the gcc command line, so don't set it there
+
 * Wed Oct 11 2006 Doug Ledford <dledford at redhat.com> - 1.1-6
 - Bump rev to match fc6 rev
 - Fixup some issue with alternatives support