rpms/mpich2/devel .cvsignore, 1.2, 1.3 mpich2.spec, 1.2, 1.3 sources, 1.2, 1.3 mpich2-1.0.8-rpmbuild.patch, 1.1, NONE mpich2.module.in, 1.1, NONE

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25727

Modified Files:
	.cvsignore mpich2.spec sources 
Removed Files:
	mpich2-1.0.8-rpmbuild.patch mpich2.module.in 
Log Message:
* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.1.b1
- Update for the 1.1 (beta) release
- Stop building with dllchan, it is not fully supported
- Fix un-owned directory (#490270)
- Add Posttrans scriplets to work around 1.0.8-3 scriplet brokenness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2009 12:48:04 -0000	1.2
+++ .cvsignore	19 Mar 2009 01:42:35 -0000	1.3
@@ -1 +1 @@
-mpich2-1.0.8.tar.gz
+mpich2-1.1b1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpich2.spec	10 Mar 2009 02:46:30 -0000	1.2
+++ mpich2.spec	19 Mar 2009 01:42:35 -0000	1.3
@@ -1,13 +1,11 @@
-Summary:	An implementation of MPI
+Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.0.8
-Release:	3%{?dist}
+Version:	1.1
+Release:	0.1.b1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
-Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
-Source1:	mpich2.module.in
-Patch0:		mpich2-%{version}-rpmbuild.patch
+Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}b1/src/%{name}-%{version}b1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, e2fsprogs-devel
 BuildRequires:	java-devel, gcc-gfortran
@@ -41,6 +39,7 @@
 Requires:	gcc-gfortran
 Requires(post):	/usr/sbin/alternatives
 Requires(preun):/usr/sbin/alternatives
+Requires(posttrans):/usr/sbin/alternatives
 
 %description devel
 Contains development headers and libraries for mpich2
@@ -61,12 +60,10 @@
 %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}}
 %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}}
 
-%define selected_channels ch3:dllchan:sock,shm,ssm 
 %ifarch %{ix86} x86_64
 %define selected_channels ch3:nemesis
-%endif
-%ifarch ppc ppc64
-%define selected_channels ch3:dllchan:sock,shm 
+%else
+%define selected_channels ch3:sock
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
@@ -82,8 +79,7 @@
 %endif
 
 %prep
-%setup -q
-%patch0 -p0 -b .build
+%setup -q -n %{name}-%{version}b1
 
 %configure	\
 	--enable-sharedlibs=gcc					\
@@ -122,7 +118,7 @@
   mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
 done
 
-## Setup the executables for environment module
+## 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
@@ -134,9 +130,9 @@
 mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 
-## Create modules file
-sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > %{buildroot}%{_datadir}/%{name}/%{name}.module
-#:;
+# Adjust the default 'environment module' PATH for our changes
+sed -i 's#bin#bin'%{mode}'#' %{buildroot}%{_datadir}/%{name}/%{name}.module
+
 
 # Manually copy doc file here instead of the %files section to prevent the rpm
 #build script from throwing the other things in there out
@@ -163,6 +159,24 @@
 rm -rf %{buildroot}
 
 %post
+if [ $1 -eq 1 ] ; then
+/usr/sbin/alternatives	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
+			%{_mandir}/man1/mp-mpiexec.1.gz		\
+	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man		\
+			%{_mandir}/man1/mp-mpif90.1.gz		\
+	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man		\
+			%{_mandir}/man1/mp-mpif77.1.gz		\
+	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
+			%{_mandir}/man1/mp-mpicc.1.gz		\
+	--slave	%{_mandir}/man1/mpic++.1.gz mpic++-man		\
+			%{_mandir}/man1/mp-mpicxx.1.gz
+fi
+
+%posttrans
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
@@ -176,24 +190,41 @@
 			%{_mandir}/man1/mp-mpicc.1.gz		\
 	--slave	%{_mandir}/man1/mpic++.1.gz mpic++-man		\
 			%{_mandir}/man1/mp-mpicxx.1.gz
+fi
 
 %preun
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
+fi
 
 %post devel
+if [ $1 -eq 1 ] ; then
+/usr/sbin/alternatives	\
+	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
+	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
+	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
+	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+fi
+
+%posttrans devel
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
 	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
 	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
 	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+fi
 
 %preun devel
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
+fi
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/bin%{mode}
 %{_datadir}/%{name}/bin%{mode}/mpiexec
 %{_datadir}/%{name}/bin%{mode}/mpirun
 %exclude %{_bindir}/mp%{mode}-mpicc
@@ -237,6 +268,12 @@
 %doc README.testing README.romio README.developer
 
 %changelog
+* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.1.b1
+- Update for the 1.1 (beta) release
+- Stop building with dllchan, it is not fully supported
+- Fix un-owned directory (#490270)
+- Add Posttrans scriplets to work around 1.0.8-3 scriplet brokenness
+
 * 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+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2009 12:48:04 -0000	1.2
+++ sources	19 Mar 2009 01:42:35 -0000	1.3
@@ -1 +1 @@
-d9dfb6e38d7ca6f8ad92a191a413ee57  mpich2-1.0.8.tar.gz
+09661f584a89ec3aa5ea6ee8cc0feb0b  mpich2-1.1b1.tar.gz


--- mpich2-1.0.8-rpmbuild.patch DELETED ---


--- mpich2.module.in DELETED ---