diff --git a/.gitignore b/.gitignore index ba8757e..820bd56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/openmpi-1.10.7.tar.bz2 SOURCES/openmpi-1.6.4-clean.tar.xz -SOURCES/openmpi-3.0.0.tar.bz2 +SOURCES/openmpi-3.0.2.tar.bz2 diff --git a/.openmpi.metadata b/.openmpi.metadata index dc068e2..0091a1e 100644 --- a/.openmpi.metadata +++ b/.openmpi.metadata @@ -1,3 +1,3 @@ fe359d8caa4888625308cf03343d913dd5ac6198 SOURCES/openmpi-1.10.7.tar.bz2 24ec0fd3b82c72df9086e5b6b6be6d0a72f70892 SOURCES/openmpi-1.6.4-clean.tar.xz -fa63990db1aec88b36335a1d79abf47ac6348e23 SOURCES/openmpi-3.0.0.tar.bz2 +d863a83a392f8d0e0d68a035aa8382652615f406 SOURCES/openmpi-3.0.2.tar.bz2 diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec index d8f3904..2143dcb 100644 --- a/SPECS/openmpi.spec +++ b/SPECS/openmpi.spec @@ -21,10 +21,11 @@ %global majmin 1.10 %global mainversion %{majmin}.7 +%global ompi3ver 3.0.2 Name: openmpi%{?_cc_name_suffix} Version: %{mainversion} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Message Passing Interface Group: Development/Libraries License: BSD and MIT and Romio @@ -49,7 +50,7 @@ Patch102: openmpi-1.6.4-ppc64le.patch # Backport of gcc atomics needed for AArch64 Patch103: openmpi-1.6.4-aarch64.patch -Source300: https://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.0.tar.bz2 +Source300: https://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-%{ompi3ver}.tar.bz2 Source301: openmpi3.module.in Source302: macros.openmpi3 # Only for ppc64le @@ -116,7 +117,7 @@ Contains development headers and libraries for openmpi %package -n openmpi3%{?_cc_name_suffix} Summary: Open Message Passing Interface 3 Group: Development/Libraries -Version: 3.0.0 +Version: %{ompi3ver} Release: 1%{?dist} Provides: mpi Requires: environment-modules @@ -151,7 +152,7 @@ Features implemented or in short-term development for Open MPI include: %package -n openmpi3%{?_cc_name_suffix}-devel Summary: Development files for openmpi3 Group: Development/Libraries -Version: 3.0.0 +Version: %{ompi3ver} Release: %{release} Requires: openmpi3%{?_cc_name_suffix}%{?_isa} = %{version}-%{release}, gcc-gfortran Provides: mpi-devel @@ -166,7 +167,7 @@ Contains development headers and libraries for openmpi3. Summary: Open MPI 1.6 compat library Group: Development/Libraries Version: 1.6.4 -Release: 10.6%{?dist} +Release: 10.7%{?dist} Provides: mpi Requires: environment-modules @@ -229,7 +230,7 @@ Contains development headers and libraries for compat-openmpi16 %patch2 -p1 cd .. -cd openmpi-3.0.0 +cd openmpi-%{ompi3ver} %ifarch ppc64le %patch301 -p1 %endif @@ -293,7 +294,7 @@ cd .. %global libname %{variant}%{?_cc_name_suffix} %global namearch %{variant}-%{_arch}%{?_cc_name_suffix} -cd openmpi-3.0.0 +cd openmpi-%{ompi3ver} ./configure --prefix=%{_libdir}/%{libname} \ --mandir=%{_mandir}/%{namearch} \ --includedir=%{_includedir}/%{namearch} \ @@ -426,7 +427,7 @@ cd .. %global libname %{variant}%{?_cc_name_suffix} %global namearch %{variant}-%{_arch}%{?_cc_name_suffix} -cd openmpi-3.0.0 +cd openmpi-%{ompi3ver} make install DESTDIR=%{buildroot} find %{buildroot}%{_libdir}/%{libname}/lib -name \*.la | xargs rm find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9 @@ -510,7 +511,7 @@ make check cd .. %ifnarch ppc ppc64 -cd openmpi-3.0.0 +cd openmpi-%{ompi3ver} make check cd .. %endif @@ -719,6 +720,10 @@ cd .. %endif %changelog +* Wed Jun 13 2018 Jarod Wilson - 1.10.7-2 +- Update openmpi3 sub-package to OpenMPI v3.0.2 +- Resolves: #1483570 + * Fri Nov 03 2017 Michal Schmidt - 1.10.7-1 - Update to upstream release 1.10.7. - Add Open MPI 3.0.0 subpackage (openmpi3).