rpms/mpich2/EL-5 .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
Deji Akingunola
deji at fedoraproject.org
Thu Jul 23 13:37:12 UTC 2009
- Previous message (by thread): rpms/python-repoze-what-pylons/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/strigi/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 strigi-daemon.desktop, 1.3, 1.4 strigi.spec, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: deji
Update of /cvs/pkgs/rpms/mpich2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21944
Modified Files:
.cvsignore mpich2.spec sources
Removed Files:
mpich2-1.0.8-rpmbuild.patch mpich2.module.in
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/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 29 Mar 2009 02:10:13 -0000 1.3
+++ .cvsignore 23 Jul 2009 13:36:42 -0000 1.4
@@ -1 +1 @@
-mpich2-1.0.8p1.tar.gz
+mpich2-1.1.1.tar.gz
Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/mpich2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mpich2.spec 30 Mar 2009 04:05:57 -0000 1.5
+++ mpich2.spec 23 Jul 2009 13:36:42 -0000 1.6
@@ -1,18 +1,17 @@
-Summary: An implementation of MPI
+Summary: A high-performance implementation of MPI
Name: mpich2
-Version: 1.0.8p1
-Release: 2%{?dist}
+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}/%{name}-%{version}.tar.gz
-Source1: mpich2.module.in
-Patch0: mpich2-1.0.8-rpmbuild.patch
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
@@ -39,49 +38,42 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: gcc-gfortran
-Requires(post): chkconfig
-Requires(preun):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
-%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}
+%{!?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
%configure \
--enable-sharedlibs=gcc \
@@ -93,7 +85,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}" \
@@ -114,27 +106,41 @@ 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
+rm -f mpic++
+touch mpic++
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
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}/
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
+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
@@ -161,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 \
@@ -173,7 +182,24 @@ 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
+
+%posttrans
+if [ $1 -eq 0 ] ; then
+/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/mpicxx.1.gz mpicxx-man \
%{_mandir}/man1/mp-mpicxx.1.gz
fi
@@ -182,11 +208,24 @@ 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
+
+%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
fi
@@ -199,51 +238,60 @@ fi
%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}/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}/*mpic*
+%exclude %{_bindir}/*mpif*
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%config %{_sysconfdir}/%{name}-%{mode}/
%doc %{_docdir}/%{name}-%{version}/
-%{_mandir}/man1/*
+%doc %{_datadir}/%{name}/doc/
+%{_mandir}/man1/mp-*.1.gz
%if 0%{?fedora} < 11
%exclude %{_bindir}/mp*.pyc
%exclude %{_bindir}/mp*.pyo
%endif
-
-%files libs
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.jar
-%{_libdir}/%{name}/mpe*.o
-%{_libdir}/%{name}/*.so.*
-%config %{_sysconfdir}/%{name}-%{mode}/
+%ghost %{_bindir}/mpiexec
+%ghost %{_bindir}/mpirun
+%ghost %{_mandir}/man1/mpi*.1.gz
+%ghost %{_mandir}/man1/MPI.1.gz
%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}/mpic++
+%ghost %{_bindir}/mpif90
+%ghost %{_bindir}/mpif77
%{_includedir}/*
%{_libdir}/%{name}/*.a
%{_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.
+
* Sun Mar 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8p1-2
- Specifically build with openjdk Java, so Jumpshot works (Anthony Chan)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 29 Mar 2009 02:10:13 -0000 1.3
+++ sources 23 Jul 2009 13:36:42 -0000 1.4
@@ -1 +1 @@
-8ff91187e264e75b5f9307018983ba2b mpich2-1.0.8p1.tar.gz
+01bffc9233411495c973d52c8ee15bf9 mpich2-1.1.1.tar.gz
--- mpich2-1.0.8-rpmbuild.patch DELETED ---
--- mpich2.module.in DELETED ---
- Previous message (by thread): rpms/python-repoze-what-pylons/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/strigi/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 strigi-daemon.desktop, 1.3, 1.4 strigi.spec, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list