rpms/mpich2/F-10 mpich2.spec,1.1,1.2

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10275

Modified Files:
	mpich2.spec 
Log Message:
* Mon Mar 09 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-3
- Drop the ssm channel from ppc* archs, it fails to build
- Python scripts in bindir and sbindir are no longer bytecompiled (F-11+)
- Enhance the spec file to support ia64 and sparc
- Include mpiexec and mpirun (symlinks) in the environment module bindir 



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/mpich2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpich2.spec	9 Mar 2009 12:51:04 -0000	1.1
+++ mpich2.spec	10 Mar 2009 04:13:09 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	An implementation of MPI
 Name:		mpich2
 Version:	1.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -64,15 +64,15 @@
 %ifarch %{ix86} x86_64
 %define selected_channels ch3:nemesis
 %else
-%define selected_channels ch3:dllchan:sock,shm,ssm 
+%define selected_channels ch3:sock 
 %endif
 
-%ifarch %{ix86} ppc
-%define mode 32
-%define priority 40
-%else
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define mode 64
 %define priority 41
+%else
+%define mode 32
+%define priority 40
 %endif
 
 %ifarch x86_64
@@ -115,12 +115,19 @@
 pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
 popd
-mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode}
 for b in mpicxx mpicc mpif77 mpif90; do 
   mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
   mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
+done
+
+## Setup the executables for environment module
+mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode}
+for b in mpicxx mpicc mpif77 mpif90; do 
   ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b
 done
+for ex in mpiexec mpirun; do 
+  ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$ex
+done
 
 mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
@@ -184,14 +191,19 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%exclude %{_bindir}/mp*.pyc
-%exclude %{_bindir}/mp*.pyo
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/bin%{mode}/mpiexec
+%{_datadir}/%{name}/bin%{mode}/mpirun
 %exclude %{_bindir}/mp%{mode}-mpicc
 %exclude %{_bindir}/mp%{mode}-mpicxx
 %exclude %{_bindir}/mp%{mode}-mpif90
 %exclude %{_bindir}/mp%{mode}-mpif77
 %doc %{_docdir}/%{name}-%{version}/
 %{_mandir}/man1/*
+%if 0%{?fedora} < 11
+%exclude %{_bindir}/mp*.pyc
+%exclude %{_bindir}/mp*.pyo
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -212,17 +224,25 @@
 %{_libdir}/%{name}/*.so
 %{_libdir}/%{name}/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/bin%{mode}/
 %{_datadir}/%{name}/%{name}.module
+%{_datadir}/%{name}/bin%{mode}/mpicc
+%{_datadir}/%{name}/bin%{mode}/mpicxx
+%{_datadir}/%{name}/bin%{mode}/mpif90
+%{_datadir}/%{name}/bin%{mode}/mpif77
 %{_datadir}/%{name}/examples*
 %{_datadir}/%{name}/logfiles/
 %{_mandir}/man4/*.gz
 %doc README.testing README.romio README.developer
 
 %changelog
+* Mon Mar 09 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-3
+- Drop the ssm channel from ppc* archs, it fails to build
+- Python scripts in bindir and sbindir are no longer bytecompiled (F-11+)
+- Enhance the spec file to support ia64 and sparc
+- Include mpiexec and mpirun (symlinks) in the environment module bindir 
+
 * Fri Mar 06 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-2
-- Fix the source url, pointed out from package review 
+- Fix the source url, pointed out from package review
 - Finally accepted to go into Fedora
 
 * Sat Oct 24 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.8-1