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

Mon Mar 9 12:48:34 UTC 2009

Author: deji

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mpich2-1.0.8-rpmbuild.patch mpich2.module.in 
	mpich2.spec 
Log Message:
Initial import

--- NEW FILE import.log ---
mpich2-1_0_8-2_fc10:HEAD:mpich2-1.0.8-2.fc10.src.rpm:1236602656

mpich2-1.0.8-rpmbuild.patch:

--- NEW FILE mpich2-1.0.8-rpmbuild.patch ---
--- src/mpe2/sbin/mpeinstall.in	2008-10-24 12:56:05.000000000 -0400
+++ src/mpe2/sbin/mpeinstall.in.new	2008-10-24 22:37:15.886589567 -0400
@@ -40,10 +40,10 @@
 mandir=@mandir@
 # Since autoconf < 2.60 does not set docdir and htmldir,
 # check if they are set.  If not, set them accordingly.
-if [ "$docdir" = "@docdir@" ] ; then
+if [ "$docdir" != "@docdir@" ] ; then
     docdir=${datadir}/doc/${PACKAGE}
 fi
-if [ "$htmldir" = "@htmldir@" ] ; then
+if [ "$htmldir" != "@htmldir@" ] ; then
     htmldir=${docdir}
 fi
 
@@ -440,10 +440,10 @@
     mandir=@mandir@
     # Since autoconf < 2.60 does not set docdir and htmldir,
     # check if they are set.  If not, set them accordingly.
-    if [ "$docdir" = "@docdir@" ] ; then
+    if [ "$docdir" != "@docdir@" ] ; then
         docdir=${datadir}/doc/${PACKAGE}
     fi
-    if [ "$htmldir" = "@htmldir@" ] ; then
+    if [ "$htmldir" != "@htmldir@" ] ; then
         htmldir=${docdir}
     fi
     if [ $appendUninstall = 0 ] ; then
@@ -493,7 +493,6 @@
 if [ -n "$etcbuild_dir" ] ; then
     if [ -d $etcbuild_dir ] ; then
          echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir"
-         InstallDirRecur $etcbuild_dir $sysconfdir $MODE
          cd $etcbuild_dir && \
          for file in *.conf ; do \
              FixInstallFile $file $sysconfdir/$file ; \
--- src/mpe2/src/slog2sdk/sbin/install-package.in	2008-10-24 12:56:05.000000000 -0400
+++ src/mpe2/src/slog2sdk/sbin/install-package.in.new	2008-10-24 23:02:20.047590684 -0400
@@ -39,7 +39,7 @@
 docdir=@docdir@
 # Since autoconf < 2.60 does not set docdir,
 # check if it is set.  If not, set it accordingly.
-if [ "$docdir" = "@docdir@" ] ; then
+if [ "$docdir" != "@docdir@" ] ; then
     docdir=${datadir}/doc/${PACKAGE}
 fi
 
@@ -388,7 +388,7 @@
     docdir=@docdir@
     # Since autoconf < 2.60 does not set docdir,
     # check if it is set.  If not, set it accordingly.
-    if [ "$docdir" = "@docdir@" ] ; then
+    if [ "$docdir" != "@docdir@" ] ; then
         docdir=${datadir}/doc/${PACKAGE}
     fi
     if [ $appendUninstall = 0 ] ; then
--- src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in	2007-05-29 18:25:53.000000000 -0400
+++ src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in.new	2007-10-15 22:23:20.000000000 -0400
@@ -48,7 +48,7 @@
 
 JNI_INC          = @JNI_INC@
 CFLAGS           = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
-LDFLAGS          = -module -no-undefined -avoid-version @LDFLAGS@
+LDFLAGS          = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@
 
 # memory leak checker
 MEMLIBS          = @DEBUG_LIBS@
--- src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in	2007-05-29 18:25:53.000000000 -0400
+++ src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in.new	2007-10-15 22:23:20.000000000 -0400
@@ -48,7 +48,7 @@
 
 JNI_INC          = @JNI_INC@
 CFLAGS           = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
-LDFLAGS          = -module -no-undefined -avoid-version @LDFLAGS@
+LDFLAGS          = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@
 
 # memory leak checker
 MEMLIBS          = @DEBUG_LIBS@


--- NEW FILE mpich2.module.in ---
#%Module 1.0
#
#  MPICH2 module for use with 'environment-modules' package:
# 
prepend-path 		PATH 		@DATADIR@/bin at MODE@
setenv			CFLAGS		-I at INCLUDEDIR@
setenv			LDFLAGS		-L at LIBDIR@ -lmpich


--- NEW FILE mpich2.spec ---
Summary:	An implementation of MPI
Name:		mpich2
Version:	1.0.8
Release:	2%{?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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libXt-devel, e2fsprogs-devel
BuildRequires:	java-devel, gcc-gfortran
BuildRequires:	emacs-common, perl, python
Requires:	%{name}-libs = %{version}-%{release}
Requires:	python
Requires(post):	chkconfig
Requires(preun):chkconfig
#Requires chkconfig for /usr/sbin/alternatives

%description
MPICH2 is a high-performance and widely portable implementation of the
MPI standard. This release has all MPI-2.1 functions and features
required by the standard with the exeption of support for the
"external32" portable I/O format.

The mpich2 binaries in Fedora were configured to use the default
process manager 'MPD' using the default device 'ch3'. The ch3 device
was configured with support for the nemesis channel that allows for
shared-memory and TCP/IP sockets based communication.

The Fedora builds also include support for using '/usr/sbin/alternatives'
and/or the 'module environment' to select which MPI implementation to use
when multiple implementations are installed.

%package devel
Summary:	Development files for mpich2
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
Requires:	gcc-gfortran
Requires(post):	/usr/sbin/alternatives
Requires(preun):/usr/sbin/alternatives

%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: %define opt_cc gcc}
%{!?opt_fc: %define 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}}

%ifarch %{ix86} x86_64
%define selected_channels ch3:nemesis
%else
%define selected_channels ch3:dllchan:sock,shm,ssm 
%endif

%ifarch %{ix86} ppc
%define mode 32
%define priority 40
%else
%define mode 64
%define priority 41
%endif

%ifarch x86_64
%define XFLAGS -fPIC
%endif

%prep
%setup -q
%patch0 -p0 -b .build

%configure	\
	--enable-sharedlibs=gcc					\
	--with-device=%{selected_channels}			\
	--sysconfdir=%{_sysconfdir}/%{name}-%{mode}		\
	--includedir=%{_includedir}/%{name}			\
	--libdir=%{_libdir}/%{name}				\
	--datadir=%{_datadir}/%{name}				\
	--docdir=%{_docdir}/%{name}-%{version}			\
	--htmldir=%{_docdir}/%{name}-%{version}/www		\
	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
	F90=%{opt_fc} 						\
	F77=%{opt_fc}						\
	CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}"			\
	CXXFLAGS="%{optflags} %{?XFLAGS}"			\
	F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
	FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
	LDFLAGS='-Wl,-z,noexecstack'

%build
#make %{?_smp_mflags} doesn't work
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun
rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun}
mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
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;
  ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b
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
#:;

# Manually copy doc file here instead of the %files section to prevent the rpm
#build script from throwing the other things in there out
cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/
cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe

# Silence rpmlint
sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*}

#Rename the MPI routine manpages, to avoid conflict with openmpi
for man in %{buildroot}%{_mandir}/man3/*; do
  manf=`basename $man .3`
  mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4
  sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4
done

# The uninstall script that is installed in this directory is not needed in rpm
# packaging 
rm -rf %{buildroot}%{_sbindir}/mpe*

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
/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

%preun
/usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py

%post devel
/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

%preun devel
/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc

%files
%defattr(-,root,root,-)
%{_bindir}/*
%exclude %{_bindir}/mp*.pyc
%exclude %{_bindir}/mp*.pyo
%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/*

%files libs
%defattr(-,root,root,-)
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.jar
%{_libdir}/%{name}/mpe*.o
%{_libdir}/%{name}/*.so.*
%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
%{_includedir}/*
%{_libdir}/%{name}/*.a
%{_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}/examples*
%{_datadir}/%{name}/logfiles/
%{_mandir}/man4/*.gz
%doc README.testing README.romio README.developer

%changelog
* Fri Mar 06 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-2
- 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
- Update to the 1.0.8
- Configure with the default nemesis channel

* Fri May 16 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.7-5
- Update the alternate compiler/compiler flags macro to allow overriding it
  from command-line

* Wed Apr 16 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.7-4
- Apply patch from Orion Poplawski to silence rpmlint

* Tue Apr 15 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.7-3
- Add a note on the device/channels configuration options used, and
- Fix logfile listings as suggested by Orion Poplawski (Package review, 171993)

* Tue Apr 15 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.7-2
- Fix the source url

* Sat Apr 05 2008 Deji Akingunola <dakingun at gmail.com> - 1.0.7-1
- Update to 1.0.7

* Mon Oct 15 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.6p1-1
- Update to 1.0.6p1

* Mon Oct 15 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.6-1
- New version upgrade

* Mon Jul 31 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p4-4
- Create a -mpi-manpages subpackage for the MPI routines manuals

* Fri Jul 27 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p4-3
- Fix java-gcj-compat BR
- Handle upgrades in the post scripts

* Mon Jun 12 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p4-2
- Fix typos and make other adjustments arising from Fedora package reviews

* Mon Jun 12 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p4-1
- Patch #4 release

* Mon Feb 12 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p2-1
- Patch #2 release

* Tue Jan 09 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.5p1-1
- New release with manpages
- Create a -libs subpackage as it's done in Fedora's openmpi to help with
  multi-libs packaging
- Disable modules support (until I can properly figure it out)

* Wed Dec 27 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.5-1
- New release

* Sat Nov 18 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.4p1-2
- Set the java_sdk directory so all java bit work  

* Sat Sep 02 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.4p1-1
- Update to version 1.0.4p1
- Cleanup up spec file to use alternatives similarly to FC's openmpi

* Wed Aug 02 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.4-1
- Update to version 1.0.4

* Thu May 18 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.3-3
- Add missing BRs (Orion Polawski)

* Mon Apr 10 2006 Deji Akingunola <dakingun at gmail.com> - 1.0.3-2
- Rewrite the spec, borrowing extensively from openmpi's spec by Jason Vas Dias
- Allows use of environment modules and alternatives

* Fri Nov 25 2005 Deji Akingunola <dakingun at gmail.com> - 1.0.3-1
- Update to new version

* Sat Oct 15 2005 Deji Akingunola <deji.aking at gmail.com> - 1.0.2p1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2009 17:25:36 -0000	1.1
+++ .cvsignore	9 Mar 2009 12:48:04 -0000	1.2
@@ -0,0 +1 @@
+mpich2-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2009 17:25:36 -0000	1.1
+++ sources	9 Mar 2009 12:48:04 -0000	1.2
@@ -0,0 +1 @@
+d9dfb6e38d7ca6f8ad92a191a413ee57  mpich2-1.0.8.tar.gz


