rpms/mpich2/F-13 mpich2-modules.patch, 1.5, 1.6 mpich2.spec, 1.21, 1.22 sources, 1.9, 1.10 mpich2-mpdboot_hang_fix.patch, 1.1, NONE

Mon Mar 1 20:23:58 UTC 2010

Author: deji

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

Modified Files:
	mpich2-modules.patch mpich2.spec sources 
Removed Files:
	mpich2-mpdboot_hang_fix.patch 
Log Message:
* Tue Feb 23 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1
- Update to 1.2.1p1
- Ship the mpi compilers in the main package
- Remove alternatives support
- Add script to load mpich2 module on login


mpich2-modules.patch:
 mpich2.module.in |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: mpich2-modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-13/mpich2-modules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6

--- mpich2-modules.patch	26 Nov 2009 14:50:24 -0000	1.5
+++ mpich2-modules.patch	1 Mar 2010 20:23:57 -0000	1.6
@@ -1,6 +1,6 @@
 --- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
 +++ src/packaging/envmods/mpich2.module.in.new	2009-11-09 10:37:03.524042574 -0500
-@@ -4,11 +4,15 @@
+@@ -4,11 +4,16 @@
  # 
  
  # Define prefix so PATH and MANPATH can be updated.
@@ -12,11 +12,12 @@
 +setenv        MPI_INCLUDE   @includedir@
 +setenv        MPI_LIB       @libdir@
 +setenv        MPI_MAN       @mandir@
-+setenv        MPI_PYTHON_SITEARCH	@bindir@
++setenv        MPI_PYTHON_SITEARCH	@pysitearch@/@MPILIBNAME at 2
 +setenv        MPI_COMPILER  @MPILIBNAME at 2-@ARCH@
 +setenv        MPI_SUFFIX    _ at MPILIBNAME@2
 +setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME at 2
  prepend-path  PATH          @bindir@
++prepend-path  LD_LIBRARY_PATH @libdir@
  prepend-path  MANPATH       @mandir@
 -
 -# Undefine prefix and exec_prefix which are too generic environment variables.


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-13/mpich2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mpich2.spec	8 Feb 2010 15:05:54 -0000	1.21
+++ mpich2.spec	1 Mar 2010 20:23:58 -0000	1.22
@@ -1,14 +1,15 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.2.1
-Release:	5%{?dist}
+Version:	1.2.1p1
+Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
 Source0:	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
 Source1:	mpich2.macros	
 Patch0:		mpich2-modules.patch
-Patch1:		mpich2-mpdboot_hang_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -16,9 +17,7 @@ BuildRequires:	emacs-common, perl, pytho
 Obsoletes:	%{name}-libs < 1.1.1
 Requires:	environment-modules
 Requires:	python
-Requires(post):	chkconfig
-Requires(preun):chkconfig
-Requires(posttrans):chkconfig
+Requires(pre):chkconfig
 #Requires chkconfig for /usr/sbin/alternatives
 
 %description
@@ -43,9 +42,7 @@ Provides:	%{name}-devel-static = %{versi
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran 
-Requires(post):	chkconfig
-Requires(preun):chkconfig
-Requires(posttrans):chkconfig
+Requires(pre):chkconfig
 #Requires chkconfig for /usr/sbin/alternatives
 
 %description devel
@@ -96,7 +93,6 @@ Contains documentations, examples and ma
 %prep
 %setup -q
 %patch0 -p0 -b .modu
-%patch1 -p0 -b .fix
 
 %build
 %configure	\
@@ -105,6 +101,7 @@ Contains documentations, examples and ma
 	--with-device=%{selected_channels}			\
 	--sysconfdir=%{_sysconfdir}/%{name}-%{_arch}		\
 	--includedir=%{_includedir}/%{name}-%{_arch}		\
+	--bindir=%{_libdir}/%{name}/bin				\
 	--libdir=%{_libdir}/%{name}/lib				\
 	--datadir=%{_datadir}/%{name}				\
 	--mandir=%{_mandir}/%{name}				\
@@ -136,30 +133,6 @@ make VERBOSE=1
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_libdir}/%{name}/bin %{buildroot}%{_mandir}/man1
-rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun}
-
-for execfile in mpiexec mpirun; do 
-  ln -s ../../../bin/mpiexec.py %{buildroot}%{_libdir}/%{name}/bin/$execfile
-done
-BASIC_PGMS="slog2print slog2navigator slog2filter slog2updater logconvertor jumpshot"
-CLOG_PGMS="clogprint clogTOslog2 clog2print clog2TOslog2"
-RLOG_PGMS="rlogprint rlogTOslog2"
-for exefile in $BASIC_PGMS $CLOG_PGMS $RLOG_PGMS mpich2version ; do
-  mv %{buildroot}%{_bindir}/$exefile %{buildroot}%{_libdir}/%{name}/bin/$exefile
-done
-
-pushd  %{buildroot}%{_bindir}/
-ln -s mpiexec.py mpdrun
-touch mpiexec mpirun mpich2version
-touch %{buildroot}%{_mandir}/man1/mpiexec.1
-popd
-for b in mpicxx mpicc mpif77 mpif90 mpic++; do 
-  mv %{buildroot}%{_bindir}/$b %{buildroot}%{_libdir}/%{name}/bin/;
-  touch %{buildroot}%{_bindir}/$b;
-  touch %{buildroot}%{_mandir}/man1/$b.1;
-done
-
 mv %{buildroot}%{_libdir}/%{name}/lib/pkgconfig %{buildroot}%{_libdir}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 
@@ -167,10 +140,18 @@ chmod -x %{buildroot}%{_libdir}/pkgconfi
 #mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
 # Install the module file
-mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
-sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
-
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+mkdir -p %{buildroot}%{python_sitearch}/%{name}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich2.sh
+# Load mpich2 environment module
+module load %{name}-%{_arch}
+EOF
+cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich2.{sh,csh}
+ 
 # Install the RPM macro
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
@@ -189,132 +170,63 @@ done
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-rm %{buildroot}%{_libdir}/%{name}/lib/lib*mpich*.a
+rm -f %{buildroot}%{_libdir}/%{name}/lib/lib*mpich*.a
 
 %clean
 rm -rf %{buildroot}
 
 %post
-
 /sbin/ldconfig
 
-if [ $1 -eq 1 ] ; then
-/usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
-	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
-	--slave	%{_bindir}/mpich2version mpi-ver			\
-			%{_libdir}/%{name}/bin/mpich2version		\
-	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
-			%{_mandir}/%{name}/man1/mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
-			%{_mandir}/%{name}/man1/mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
-			%{_mandir}/%{name}/man1/mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
-			%{_mandir}/%{name}/man1/mpicxx.1.gz
-fi
-
-%posttrans
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
-	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
-	--slave	%{_bindir}/mpich2version mpi-ver			\
-			%{_libdir}/%{name}/bin/mpich2version		\
-	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
-			%{_mandir}/%{name}/man1/mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
-			%{_mandir}/%{name}/man1/mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
-			%{_mandir}/%{name}/man1/mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
-			%{_mandir}/%{name}/man1/mpicxx.1.gz
-fi
-
-%preun
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
-fi
-
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
-%post devel
-if [ $1 -eq 1 ] ; then
-/usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
-	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
-	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
-	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
-	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
-fi
-# Remove the old alternative
+%pre
 if [ $1 -gt 1 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{__isa_bits}-mpicc
-fi
-
-%posttrans devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
-	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
-	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
-	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
-	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
+	if [ -e %{_bindir}/mpiexec.py ] ; then
+		/usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
+	fi
 fi
 
-%preun devel
-if [ $1 -ge 0 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_libdir}/%{name}/bin/mpicc
+%pre devel
+if [ $1 -gt 1 ] ; then
+# Remove the old alternative
+	if [ -e %{_bindir}/mp%{__isa_bits}-mpicc ] ; then
+	/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{__isa_bits}-mpicc
+	fi
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc CHANGES COPYRIGHT README src/mpe2/README.mpe2 RELEASE_NOTES
-%{_bindir}/*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/bin
 %{_libdir}/%{name}/lib/*.jar
 %{_libdir}/%{name}/lib/mpe*.o
 %{_libdir}/%{name}/lib/*.so.*
-%{_libdir}/%{name}/bin/mpiexec
-%{_libdir}/%{name}/bin/mpirun
-%{_libdir}/%{name}/bin/mpich2version
+%{_libdir}/%{name}/bin/mp*
+%{_libdir}/%{name}/bin/check_callstack
+%{_libdir}/%{name}/bin/parkill
+%{_libdir}/%{name}/bin/pmi_proxy
 %config %{_sysconfdir}/%{name}-%{_arch}/
+%dir %{python_sitearch}/%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
-%{_sysconfdir}/modulefiles/%{name}-%{_arch}
-%exclude %{_bindir}/mpif*
-%exclude %{_bindir}/mpic*
-%ghost %{_bindir}/mpiexec
-%ghost %{_bindir}/mpirun
-%ghost %{_bindir}/mpich2version
-%ghost %{_mandir}/man1/mpi*.1.gz
+%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+%{_sysconfdir}/profile.d/mpich2.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/bin/mpicc
-%{_libdir}/%{name}/bin/mpicxx
-%{_libdir}/%{name}/bin/mpic++
-%{_libdir}/%{name}/bin/mpif90
-%{_libdir}/%{name}/bin/mpif77
 %{_libdir}/%{name}/bin/*log*
 %{_libdir}/%{name}/bin/jumpshot
-%ghost %{_bindir}/mpicc
-%ghost %{_bindir}/mpicxx
-%ghost %{_bindir}/mpic++
-%ghost %{_bindir}/mpif90
-%ghost %{_bindir}/mpif77
 %{_includedir}/%{name}-%{_arch}/
 #%{_fmoddir}/%{name}/
 %{_libdir}/%{name}/lib/*.a
 %{_libdir}/%{name}/lib/*.so
 %{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
+%{_libdir}/pkgconfig/openpa.pc
 %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 %config %{_sysconfdir}/rpm/macros.%{name}
 
@@ -329,27 +241,25 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Tue Feb 23 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1
+- Update to 1.2.1p1
+- Ship the mpi compilers in the main package
+- Remove alternatives support
+- Add script to load mpich2 module on login
+
 * Mon Feb 08 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1-5
 - Properly remove the lib*mpich2*.a files
 - Backport the upstream fix for mpdboot hangs.
-
-* Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
 - add the m_option macro to replace hardcoding -m{__isa_bits}
   and define it correctly for s390, where __isa_bits is 32, but
-  the option to pass to gcc et all is -m31.
-
-* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-4
+  the option to pass to gcc et all is -m31. (Jay Fenlason )
 - Remove the *.a libs that have the shared version
 - Place the rpm macro in the -devel subpackage
-- Move the module file around (again!) to /etc/modufiles/.
-
-* Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
-- More fixes the mpich2.module patch.
 
-* Wed Nov 25 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-2
+* Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-2
 - Fix the mpich2.module patch.
 
-* Tue Nov 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-1
+* Wed Nov 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-1
 - Update to 1.2.1
 
 * Tue Nov 03 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 Nov 2009 22:57:41 -0000	1.9
+++ sources	1 Mar 2010 20:23:58 -0000	1.10
@@ -1 +1 @@
-0956a85fc7de2305eeb7cdd12742d9e9  mpich2-1.2.1.tar.gz
+fa7e8dc7c5fb60395ab26c5b239321ca  mpich2-1.2.1p1.tar.gz


--- mpich2-mpdboot_hang_fix.patch DELETED ---

