rpms/mpich2/F-11 .cvsignore, 1.4, 1.5 mpich2.spec, 1.5, 1.6 sources, 1.4, 1.5

[Deji Akingunola]

Author: deji

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

Modified Files:
	.cvsignore mpich2.spec sources 
Log Message:
* Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
- Update to 1.1.1
- Remove (and obsolete) the -libs subpackage, it is not necessary.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 18:51:44 -0000	1.4
+++ .cvsignore	22 Jul 2009 19:04:40 -0000	1.5
@@ -1 +1 @@
-mpich2-1.1.tar.gz
+mpich2-1.1.1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/mpich2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mpich2.spec	3 Jun 2009 18:51:45 -0000	1.5
+++ mpich2.spec	22 Jul 2009 19:04:40 -0000	1.6
@@ -1,16 +1,17 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1
+Version:	1.1.1
 Release:	1%{?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}/src/%{name}-%{version}.tar.gz
+Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, e2fsprogs-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
 BuildRequires:	emacs-common, perl, python
-Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	%{name}-libs < 1.1.1
+Requires:	environment-modules
 Requires:	python
 Requires(post):	chkconfig
 Requires(preun):chkconfig
@@ -44,13 +45,6 @@ Requires(posttrans):/usr/sbin/alternativ
 %description devel
 Contains development headers and libraries for mpich2
 
-%package libs
-Summary:	Libraries and configuration files for mpich2
-Group:		Development/Libraries
-
-%description libs
-Contains the arch dependent libraries and their build configuration for mpich2
-
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
 %{!?opt_cc: %global opt_cc gcc}
@@ -80,11 +74,9 @@ Contains the arch dependent libraries an
 
 %prep
 %setup -q
-sed -i 's#LDFLAGS -static#LDFLAGS#' src/pm/hydra/configure
 
 %configure	\
 	--enable-sharedlibs=gcc					\
-	--enable-threads					\
 	--with-device=%{selected_channels}			\
 	--sysconfdir=%{_sysconfdir}/%{name}-%{mode}		\
 	--includedir=%{_includedir}/%{name}			\
@@ -116,6 +108,8 @@ pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
 touch mpiexec
 touch mpirun
+rm -f mpic++
+touch mpic++
 popd
 for b in mpicxx mpicc mpif77 mpif90; do 
   mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
@@ -129,8 +123,10 @@ mkdir -p %{buildroot}%{_datadir}/%{name}
 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
+ln -s ../../../bin/mp%{mode}-mpicxx %{buildroot}%{_datadir}/%{name}/bin%{mode}/mpic++
+
+for bn in mpiexec mpirun; do 
+  ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$bn
 done
 
 mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/
@@ -142,8 +138,9 @@ echo "%{_libdir}/%{name}"	\
 	> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 # Adjust the default 'environment module' PATH for our changes
-sed -i 's#bin#bin'%{mode}'#' %{buildroot}%{_datadir}/%{name}/%{name}.module
-
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
+sed -i 's#'%{_bindir}'#'%{_datadir}/%{name}/bin%{mode}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
 
 # Manually copy doc file here instead of the %files section to prevent the rpm
 #build script from throwing the other things in there out
@@ -170,6 +167,9 @@ find %{buildroot} -type f -name "*.la" -
 rm -rf %{buildroot}
 
 %post
+
+/sbin/ldconfig
+
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
@@ -182,7 +182,7 @@ if [ $1 -eq 1 ] ; then
 			%{_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		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
 			%{_mandir}/man1/mp-mpicxx.1.gz
 fi
 
@@ -199,7 +199,7 @@ if [ $1 -eq 0 ] ; then
 			%{_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		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
 			%{_mandir}/man1/mp-mpicxx.1.gz
 fi
 
@@ -208,11 +208,14 @@ if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
 fi
 
+%postun -p /sbin/ldconfig
+
 %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}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
 	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
 	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
 fi
@@ -222,6 +225,7 @@ 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}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
 	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
 	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
 fi
@@ -231,24 +235,25 @@ if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
 fi
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.jar
+%{_libdir}/%{name}/mpe*.o
+%{_libdir}/%{name}/*.so.*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/bin%{mode}
 %{_datadir}/%{name}/bin%{mode}/mpiexec
 %{_datadir}/%{name}/bin%{mode}/mpirun
 %exclude %{_bindir}/mpiexec
 %exclude %{_bindir}/mpirun
-%exclude %{_bindir}/*mpicc
-%exclude %{_bindir}/*mpicxx
-%exclude %{_bindir}/*mpif90
-%exclude %{_bindir}/*mpif77
+%exclude %{_bindir}/*mpic*
+%exclude %{_bindir}/*mpif*
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%config %{_sysconfdir}/%{name}-%{mode}/
 %doc %{_docdir}/%{name}-%{version}/
+%doc %{_datadir}/%{name}/doc/
 %{_mandir}/man1/mp-*.1.gz
 %if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
@@ -259,20 +264,12 @@ fi
 %ghost %{_mandir}/man1/mpi*.1.gz
 %ghost %{_mandir}/man1/MPI.1.gz
 
-%files libs
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.jar
-%{_libdir}/%{name}/mpe*.o
-%{_libdir}/%{name}/*.so.*
-%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%config %{_sysconfdir}/%{name}-%{mode}/
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/mp%{mode}*
 %ghost %{_bindir}/mpicc
 %ghost %{_bindir}/mpicxx
+%ghost %{_bindir}/mpic++
 %ghost %{_bindir}/mpif90
 %ghost %{_bindir}/mpif77
 %{_includedir}/*
@@ -280,17 +277,21 @@ fi
 %{_libdir}/%{name}/*.so
 %{_libdir}/%{name}/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
-%{_datadir}/%{name}/%{name}.module
+%{_datadir}/Modules/modulefiles/%{name}-%{mode}
 %{_datadir}/%{name}/bin%{mode}/mpicc
 %{_datadir}/%{name}/bin%{mode}/mpicxx
+%{_datadir}/%{name}/bin%{mode}/mpic++
 %{_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
+* Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
+- Update to 1.1.1
+- Remove (and obsolete) the -libs subpackage, it is not necessary.
+
 * Wed May 20 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-1
 - Update to 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 18:51:45 -0000	1.4
+++ sources	22 Jul 2009 19:04:40 -0000	1.5
@@ -1 +1 @@
-aad757e1c1502429170403bb3c1a1ace  mpich2-1.1.tar.gz
+01bffc9233411495c973d52c8ee15bf9  mpich2-1.1.1.tar.gz