rpms/mpich2/EL-5 mpich2-modules.patch, NONE, 1.1 mpich2.macros, NONE, 1.1 mpich2.spec, 1.8, 1.9 sources, 1.5, 1.6
Deji Akingunola
deji at fedoraproject.org
Wed Nov 18 23:28:04 UTC 2009
Author: deji
Update of /cvs/pkgs/rpms/mpich2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041
Modified Files:
mpich2.spec sources
Added Files:
mpich2-modules.patch mpich2.macros
Log Message:
* Wed Nov 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-1
- Update to 1.2.1
- Clean-up the spec file to remove its 'Fedora-ness'.
- Adapt to the Fedora MPI packaging guildelines
- Split out a -doc subpackage
mpich2-modules.patch:
mpich2.module.in | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
--- NEW FILE mpich2-modules.patch ---
--- 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
@@ -6,9 +6,29 @@
# Define prefix so PATH and MANPATH can be updated.
setenv prefix @prefix@
setenv exec_prefix @exec_prefix@
+setenv MPI_BIN @LIBDIR@/@MPILIBNAME@/bin
+setenv MPI_SYSCONFIG @sysconfdir@
+setenv MPI_FORTRAN_MOD_DIR @includedir@
+setenv MPI_INCLUDE @includedir@
+setenv MPI_LIB @libdir@
+setenv MPI_MAN @mandir@
+setenv MPI_PYTHON_SITEARCH @bindir@
+setenv MPI_COMPILER @MPILIBNAME at -@ARCH@
+setenv MPI_SUFFIX _ at MPILIBNAME@
+setenv MPI_HOME @LIBDIR@/@MPILIBNAME@
prepend-path PATH @bindir@
prepend-path MANPATH @mandir@
# Undefine prefix and exec_prefix which are too generic environment variables.
unsetenv prefix
unsetenv exec_prefix
+unsetenv MPI_BIN
+unsetenv MPI_SYSCONFIG
+unsetenv MPI_FORTRAN_MOD_DIR
+unsetenv MPI_INCLUDE
+unsetenv MPI_LIB
+unsetenv MPI_MAN
+unsetenv MPI_PYTHON_SITEARCH
+unsetenv MPI_COMPILER
+unsetenv MPI_SUFFIX
+unsetenv MPI_HOME
--- NEW FILE mpich2.macros ---
%_mpich2_load \
. /etc/profile.d/modules.sh; \
module load mpich2-%{_arch}; \
export CFLAGS="$CFLAGS %{optflags}";
%_mpich2_unload \
. /etc/profile.d/modules.sh; \
module unload mpich2-%{_arch};
Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/mpich2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mpich2.spec 2 Sep 2009 21:55:14 -0000 1.8
+++ mpich2.spec 18 Nov 2009 23:28:04 -0000 1.9
@@ -1,11 +1,13 @@
Summary: A high-performance implementation of MPI
Name: mpich2
-Version: 1.1.1p1
+Version: 1.2.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
+Source0: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
+Source1: mpich2.macros
+Patch0: mpich2-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel, e2fsprogs-devel
%ifarch %{ix86} x86_64
@@ -19,6 +21,7 @@ Requires: environment-modules
Requires: python
Requires(post): chkconfig
Requires(preun):chkconfig
+Requires(posttrans):chkconfig
#Requires chkconfig for /usr/sbin/alternatives
%description
@@ -27,36 +30,49 @@ MPI standard. This release has all MPI-2
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
+The mpich2 binaries in this RPM packages 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'
+This build 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
+Provides: %{name}-devel-static = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: gcc-gfortran
-Requires(post): /usr/sbin/alternatives
-Requires(preun):/usr/sbin/alternatives
-Requires(posttrans):/usr/sbin/alternatives
+Requires: gcc-gfortran
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(posttrans):chkconfig
+#Requires chkconfig for /usr/sbin/alternatives
%description devel
Contains development headers and libraries for mpich2
+%package doc
+Summary: Documentations and examples for mpich2
+Group: Documentation
+BuildArch: noarch
+
+%description doc
+Contains documentations, examples and manpages for mpich2
+
# We only compile with gcc, but other people may want other compilers.
# Set the compiler here.
%{!?opt_cc: %global opt_cc gcc}
%{!?opt_fc: %global opt_fc gfortran}
+%{!?opt_f77: %global opt_f77 gfortran}
# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
# so uncomment and undefine to NOT use
%{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
+#%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
+%{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
%ifarch %{ix86} x86_64
%global selected_channels ch3:nemesis
@@ -65,10 +81,8 @@ Contains development headers and librari
%endif
%ifarch x86_64 ia64 ppc64 s390x sparc64
-%global mode 64
%global priority 41
%else
-%global mode 32
%global priority 40
%endif
@@ -78,95 +92,101 @@ Contains development headers and librari
%prep
%setup -q
+%patch0 -p0 -b .modu
+%build
%configure \
--enable-sharedlibs=gcc \
+ --enable-f90 \
--with-device=%{selected_channels} \
- --sysconfdir=%{_sysconfdir}/%{name}-%{mode} \
- --includedir=%{_includedir}/%{name} \
- --libdir=%{_libdir}/%{name} \
+ --sysconfdir=%{_sysconfdir}/%{name}-%{_arch} \
+ --includedir=%{_includedir}/%{name}-%{_arch} \
+ --libdir=%{_libdir}/%{name}/lib \
--datadir=%{_datadir}/%{name} \
- --docdir=%{_docdir}/%{name}-%{version} \
- --htmldir=%{_docdir}/%{name}-%{version}/www \
+ --mandir=%{_mandir}/%{name} \
+ --docdir=%{_datadir}/%{name}/doc \
+ --htmldir=%{_datadir}/%{name}/doc \
--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'
+ F77=%{opt_f77} \
+ CFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+ CXXFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+ F90FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+ FFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+ LDFLAGS='-Wl,-z,noexecstack' \
+ MPICH2LIB_CFLAGS="%{?opt_cc_cflags}" \
+ MPICH2LIB_CXXFLAGS="%{optflags}" \
+ MPICH2LIB_F90FLAGS="%{?opt_fc_fflags}" \
+ MPICH2LIB_FFLAGS="%{?opt_f77_fflags}"
+# MPICH2LIB_LDFLAGS='-Wl,-z,noexecstack' \
+# MPICH2_MPICC_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+# MPICH2_MPICXX_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+# MPICH2_MPIF90_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}" \
+# MPICH2_MPIF77_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"
-%build
+# F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}" \
#make %{?_smp_mflags} doesn't work
-make
+make VERBOSE=1
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun
+mkdir -p %{buildroot}%{_libdir}/%{name}/bin %{buildroot}%{_mandir}/man1
rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun}
-mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
+
+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
-touch mpirun
-rm -f mpic++
-touch mpic++
+touch mpiexec mpirun mpich2version
+touch %{buildroot}%{_mandir}/man1/mpiexec.1
popd
-for b in mpicxx mpicc mpif77 mpif90; do
- mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+for b in mpicxx mpicc mpif77 mpif90 mpic++; do
+ mv %{buildroot}%{_bindir}/$b %{buildroot}%{_libdir}/%{name}/bin/;
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'
-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
-done
-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}/
+mv %{buildroot}%{_libdir}/%{name}/lib/pkgconfig %{buildroot}%{_libdir}/
chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
-#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
+#mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+#mv %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
-# Adjust the default 'environment module' PATH for our changes
+# Install the module file
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}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
-# 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
+# Install the RPM macro
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
+
+cp -pr src/mpe2/README src/mpe2/README.mpe2
# Silence rpmlint
-sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*}
+sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{_arch}/{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
+# Work-around the multilib conflicts created by the makefiles
+for dirs in collchk graphics logging; do
+ mv %{buildroot}%{_datadir}/%{name}/examples_$dirs/Makefile{,-%{_arch}}
done
-# The uninstall script that is installed in this directory is not needed in rpm
-# packaging
+# The uninstall script here is not needed/necesary for rpm packaging
rm -rf %{buildroot}%{_sbindir}/mpe*
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
%clean
rm -rf %{buildroot}
@@ -176,35 +196,39 @@ rm -rf %{buildroot}
if [ $1 -eq 1 ] ; then
/usr/sbin/alternatives \
- --install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41 \
+ --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}/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/mpicxx.1.gz mpicxx-man \
- %{_mandir}/man1/mp-mpicxx.1.gz
+ %{_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 41 \
+ --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}/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/mpicxx.1.gz mpicxx-man \
- %{_mandir}/man1/mp-mpicxx.1.gz
+ %{_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
@@ -217,96 +241,126 @@ 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}/mpic++ mpic++ %{_bindir}/mp%{mode}-mpicxx \
- --slave %{_bindir}/mpif90 mpif90 %{_bindir}/mp%{mode}-mpif90 \
- --slave %{_bindir}/mpif77 mpif77 %{_bindir}/mp%{mode}-mpif77
+ --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
+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 %{_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
+ --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
%preun devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove mpicc %{_libdir}/%{name}/bin/mpicc
fi
%files
%defattr(-,root,root,-)
+%doc CHANGES COPYRIGHT README src/mpe2/README.mpe2 RELEASE_NOTES
%{_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}/*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
-%exclude %{_bindir}/mp*.pyo
-%endif
+%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
+%config %{_sysconfdir}/%{name}-%{_arch}/
+%config %{_sysconfdir}/rpm/macros.%{name}
+%dir %{_mandir}/%{name}
+%doc %{_mandir}/%{name}/man1/
+%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+%exclude %{_bindir}/mpif*
+%exclude %{_bindir}/mpic*
%ghost %{_bindir}/mpiexec
%ghost %{_bindir}/mpirun
+%ghost %{_bindir}/mpich2version
%ghost %{_mandir}/man1/mpi*.1.gz
-%ghost %{_mandir}/man1/MPI.1.gz
%files devel
%defattr(-,root,root,-)
-%{_bindir}/mp%{mode}*
+%{_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}/*
-%{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/trace_rlog/libTraceInput.so
+%{_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
-%{_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*/Makefile-%{_arch}
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/doc/
%{_datadir}/%{name}/examples*
%{_datadir}/%{name}/logfiles/
-%{_mandir}/man4/*.gz
+%{_mandir}/%{name}/man3/
+%{_mandir}/%{name}/man4/
+%exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
%changelog
-* Wed Sep 02 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
-- Update to 1.1.1p1
+* Wed Nov 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-1
+- Update to 1.2.1
+- Clean-up the spec file to remove its 'Fedora-ness'.
+- Adapt to the Fedora MPI packaging guildelines
+- Split out a -doc subpackage
+
+* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- New upstream version
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* 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.
+- Change e2fsprogs BR to libuuid
-* Sun Mar 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8p1-2
-- Specifically build with openjdk Java, so Jumpshot works (Anthony Chan)
+* Wed May 20 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-1
+- Update to 1.1
-* Sat Mar 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8p1-1
-- Update to 1.0.8p1
+* Wed May 20 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.4.rc1
+- Install the libdir under /etc/ld.so.conf.d
+
+* Mon May 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.3.rc1
+- Update to 1.1rc1
+- Update spec to follow the proposed packaging guildelines wrt using alternatives
+- Also change to use the global macro instead of define.
+
+* Sun Mar 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.2.b1
+- Specifically build with openjdk Java, so Jumpshot works (Anthony Chan)
-* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-4
-- Fix un-owned directory (Fedora Bug #490270)
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 2 Sep 2009 21:55:14 -0000 1.5
+++ sources 18 Nov 2009 23:28:04 -0000 1.6
@@ -1 +1 @@
-cb3da718237f2af826fcd85a4ab72047 mpich2-1.1.1p1.tar.gz
+0956a85fc7de2305eeb7cdd12742d9e9 mpich2-1.2.1.tar.gz
More information about the fedora-extras-commits
mailing list