rpms/mpich2/devel mpich2-modules.patch, NONE, 1.1 mpich2.macros, NONE, 1.1 .cvsignore, 1.7, 1.8 mpich2.spec, 1.11, 1.12 sources, 1.7, 1.8
Deji Akingunola
deji at fedoraproject.org
Sun Oct 25 21:39:43 UTC 2009
- Previous message: rpms/telepathy-butterfly/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 telepathy-butterfly.spec, 1.19, 1.20
- Next message: rpms/rubygem-main/devel .cvsignore, 1.4, 1.5 import.log, 1.5, 1.6 rubygem-main.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: deji
Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13920
Modified Files:
.cvsignore mpich2.spec sources
Added Files:
mpich2-modules.patch mpich2.macros
Log Message:
* Sat Oct 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
- Adapt to the Fedora MPI packaging guildelines
- Split out a -doc subpackage
- New upstream version, v1.2
mpich2-modules.patch:
mpich2.module.in | 10 ++++++++++
1 file changed, 10 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-10-13 20:22:41.814975264 -0400
@@ -6,6 +6,16 @@
# 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 @MPILIBNAME@
+setenv MPI_HOME @LIBDIR@/@MPILIBNAME@
prepend-path PATH @bindir@
prepend-path MANPATH @mandir@
--- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 11 Aug 2009 21:31:26 -0000 1.7
+++ .cvsignore 25 Oct 2009 21:39:42 -0000 1.8
@@ -1 +1 @@
-mpich2-1.1.1p1.tar.gz
+mpich2-1.2.tar.gz
Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mpich2.spec 11 Aug 2009 21:31:26 -0000 1.11
+++ mpich2.spec 25 Oct 2009 21:39:42 -0000 1.12
@@ -1,11 +1,13 @@
Summary: A high-performance implementation of MPI
Name: mpich2
-Version: 1.1.1p1
+Version: 1.2
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, libuuid-devel
BuildRequires: java-devel-openjdk, gcc-gfortran
@@ -37,7 +39,7 @@ Summary: Development files for mpich2
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: gcc-gfortran
+Requires: gcc-gfortran
Requires(post): /usr/sbin/alternatives
Requires(preun):/usr/sbin/alternatives
Requires(posttrans):/usr/sbin/alternatives
@@ -45,14 +47,25 @@ Requires(posttrans):/usr/sbin/alternativ
%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
@@ -61,10 +74,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
@@ -74,26 +85,39 @@ 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
@@ -101,66 +125,59 @@ make
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}
+
+# Install the RPM macro
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
-# 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
+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*
+rm -rf %{buildroot}%{_bindir}/*.in
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
%clean
@@ -172,35 +189,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
@@ -213,81 +234,99 @@ 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
+%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}
%if 0%{?fedora} < 11
%exclude %{_bindir}/mp*.pyc
%exclude %{_bindir}/mp*.pyo
%endif
+%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/*.gz
+%{_mandir}/%{name}/man4/*.gz
+%exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
%changelog
+* Sat Oct 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
+- Adapt to the Fedora MPI packaging guildelines
+- Split out a -doc subpackage
+- New upstream version, v1.2
+
* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- New upstream version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 11 Aug 2009 21:31:26 -0000 1.7
+++ sources 25 Oct 2009 21:39:42 -0000 1.8
@@ -1 +1 @@
-cb3da718237f2af826fcd85a4ab72047 mpich2-1.1.1p1.tar.gz
+925c8792c8aacbfca1aceae94852d591 mpich2-1.2.tar.gz
- Previous message: rpms/telepathy-butterfly/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 telepathy-butterfly.spec, 1.19, 1.20
- Next message: rpms/rubygem-main/devel .cvsignore, 1.4, 1.5 import.log, 1.5, 1.6 rubygem-main.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list