rpms/mpich2/F-10 .cvsignore, 1.3, 1.4 mpich2.spec, 1.5, 1.6 sources, 1.3, 1.4 mpich2-1.0.8-rpmbuild.patch, 1.1, NONE mpich2.module.in, 1.1, NONE

Wed Jun 3 18:56:35 UTC 2009

Author: deji

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

Modified Files:
	.cvsignore mpich2.spec sources 
Removed Files:
	mpich2-1.0.8-rpmbuild.patch mpich2.module.in 
Log Message:
* Wed May 20 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-1
- Update to 1.1
- Spec file update from F-11 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	29 Mar 2009 01:16:54 -0000	1.3
+++ .cvsignore	3 Jun 2009 18:56:04 -0000	1.4
@@ -1 +1 @@
-mpich2-1.0.8p1.tar.gz
+mpich2-1.1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/mpich2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mpich2.spec	30 Mar 2009 04:03:00 -0000	1.5
+++ mpich2.spec	3 Jun 2009 18:56:04 -0000	1.6
@@ -1,13 +1,11 @@
-Summary:	An implementation of MPI
+Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.0.8p1
-Release:	2%{?dist}
+Version:	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}/%{name}-%{version}.tar.gz
-Source1:	mpich2.module.in
-Patch0:		mpich2-1.0.8-rpmbuild.patch
+Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, e2fsprogs-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -16,7 +14,6 @@ Requires:	%{name}-libs = %{version}-%{re
 Requires:	python
 Requires(post):	chkconfig
 Requires(preun):chkconfig
-Requires(posttrans):chkconfig
 #Requires chkconfig for /usr/sbin/alternatives
 
 %description
@@ -40,9 +37,9 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran
-Requires(post):	chkconfig
-Requires(preun):chkconfig
-Requires(posttrans):chkconfig
+Requires(post):	/usr/sbin/alternatives
+Requires(preun):/usr/sbin/alternatives
+Requires(posttrans):/usr/sbin/alternatives
 
 %description devel
 Contains development headers and libraries for mpich2
@@ -56,37 +53,38 @@ Contains the arch dependent libraries an
 
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
-%{!?opt_cc: %define opt_cc gcc}
-%{!?opt_fc: %define opt_fc gfortran}
+%{!?opt_cc: %global opt_cc gcc}
+%{!?opt_fc: %global opt_fc gfortran}
 # Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
 # so uncomment and undefine to NOT use
-%{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}}
-%{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}}
+%{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
+%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
 
 %ifarch %{ix86} x86_64
-%define selected_channels ch3:nemesis
+%global selected_channels ch3:nemesis
 %else
-%define selected_channels ch3:sock 
+%global selected_channels ch3:sock
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
-%define mode 64
-%define priority 41
+%global mode 64
+%global priority 41
 %else
-%define mode 32
-%define priority 40
+%global mode 32
+%global priority 40
 %endif
 
 %ifarch x86_64
-%define XFLAGS -fPIC
+%global XFLAGS -fPIC
 %endif
 
 %prep
 %setup -q
-%patch0 -p0 -b .build
+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}			\
@@ -95,7 +93,7 @@ Contains the arch dependent libraries an
 	--docdir=%{_docdir}/%{name}-%{version}			\
 	--htmldir=%{_docdir}/%{name}-%{version}/www		\
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
-	F90=%{opt_fc} 						\
+	F90=%{opt_fc}						\
 	F77=%{opt_fc}						\
 	CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}"			\
 	CXXFLAGS="%{optflags} %{?XFLAGS}"			\
@@ -116,13 +114,17 @@ rm -f %{buildroot}%{_bindir}/{mpiexec,mp
 mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
 pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
+touch mpiexec
+touch mpirun
 popd
 for b in mpicxx mpicc mpif77 mpif90; do 
   mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+  touch %{buildroot}%{_bindir}/$b;
   mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
+  touch %{buildroot}%{_mandir}/man1/$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 +136,14 @@ done
 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
-#:;
+#Install the libdir under /etc/ld.so.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+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
+
 
 # Manually copy doc file here instead of the %files section to prevent the rpm
 #build script from throwing the other things in there out
@@ -224,6 +231,10 @@ 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}/*
@@ -231,16 +242,22 @@ fi
 %dir %{_datadir}/%{name}/bin%{mode}
 %{_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
+%exclude %{_bindir}/mpiexec
+%exclude %{_bindir}/mpirun
+%exclude %{_bindir}/*mpicc
+%exclude %{_bindir}/*mpicxx
+%exclude %{_bindir}/*mpif90
+%exclude %{_bindir}/*mpif77
 %doc %{_docdir}/%{name}-%{version}/
-%{_mandir}/man1/*
+%{_mandir}/man1/mp-*.1.gz
 %if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
 %exclude %{_bindir}/mp*.pyo
 %endif
+%ghost %{_bindir}/mpiexec
+%ghost %{_bindir}/mpirun
+%ghost %{_mandir}/man1/mpi*.1.gz
+%ghost %{_mandir}/man1/MPI.1.gz
 
 %files libs
 %defattr(-,root,root,-)
@@ -248,14 +265,16 @@ fi
 %{_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}-mpicc
-%{_bindir}/mp%{mode}-mpicxx
-%{_bindir}/mp%{mode}-mpif90
-%{_bindir}/mp%{mode}-mpif77
+%{_bindir}/mp%{mode}*
+%ghost %{_bindir}/mpicc
+%ghost %{_bindir}/mpicxx
+%ghost %{_bindir}/mpif90
+%ghost %{_bindir}/mpif77
 %{_includedir}/*
 %{_libdir}/%{name}/*.a
 %{_libdir}/%{name}/*.so
@@ -272,13 +291,17 @@ fi
 %doc README.testing README.romio README.developer
 
 %changelog
+* Wed May 20 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-1
+- Update to 1.1
+- Spec file update from F-11 branch
+
 * Sun Mar 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8p1-2
 - Specifically build with openjdk Java, so Jumpshot works (Anthony Chan)
 
 * Sat Mar 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8p1-1
 - Update to 1.0.8p1
 
-* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-4
+* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.1.b1
 - Fix un-owned directory (#490270)
 - Add Posttrans scriplets to work around 1.0.8-3 scriplet brokenness
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Mar 2009 01:16:54 -0000	1.3
+++ sources	3 Jun 2009 18:56:04 -0000	1.4
@@ -1 +1 @@
-8ff91187e264e75b5f9307018983ba2b  mpich2-1.0.8p1.tar.gz
+aad757e1c1502429170403bb3c1a1ace  mpich2-1.1.tar.gz


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


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


