Hello community, here is the log from the commit of package openmpi3 for openSUSE:Factory checked in at 2019-10-03 14:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi3 (Old) and /work/SRC/openSUSE:Factory/.openmpi3.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi3" Thu Oct 3 14:08:40 2019 rev:17 rq:734648 version:3.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi3/openmpi3.changes 2019-09-30 15:58:12.765406032 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi3.new.2352/openmpi3.changes 2019-10-03 14:08:41.812218007 +0200 @@ -1,0 +2,6 @@ +Fri Sep 27 11:17:24 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add macro file for non-hpc flavour +- Enable build on ppc64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi3.spec ++++++ --- /var/tmp/diff_new_pack.xGpRuu/_old 2019-10-03 14:08:42.476216299 +0200 +++ /var/tmp/diff_new_pack.xGpRuu/_new 2019-10-03 14:08:42.480216289 +0200 @@ -103,6 +103,9 @@ %endif %endif +# Detect whether we are the default openMPI implemantation or not +%define default_openmpi 0 + %if %{with hpc} %{!?compiler_family:%global compiler_family gnu} %{hpc_init -M -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m openmpi %{?mpi_f_ver:-V %{mpi_f_ver}}} @@ -146,7 +149,6 @@ BuildRequires: libtool # net-tools is required to run hostname BuildRequires: net-tools -ExcludeArch: ppc64 %if 0%{?testsuite} BuildArch: noarch BuildRequires: %{package_name} = %{version} @@ -187,6 +189,9 @@ Requires: openmpi-runtime-config Recommends: openmpi%{m_f_ver}-config +%if 0%{?default_openmpi} +Provides: openmpi = %{version} +%endif # OpenMPI requires ssh (or rsh) to run even on a single host # Force ssh to make sure the install works out of the box Requires: openssh @@ -301,23 +306,29 @@ This subpackage provides the documentation for Open MPI/OpenSHMEM. -%if %{with hpc} %package macros-devel -Summary: HPC Macros for openMPI version %{version} +Summary: Macros for openMPI version %{version} Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} -Provides: %{pname}-hpc-macros-devel = %{version} -Conflicts: otherproviders(%{pname}-hpc-macros-devel) +# Make sure no two openmpi macro file can be installed at once +Provides: %{pname}-macros-provider = %{version} +Conflicts: otherproviders(%{pname}-macros-provider) -%description macros-devel -HPC Macros for building RPM packages for OpenMPI version %{version}. +%if 0%{?default_openmpi} +Provides: openmpi-macros-devel = %{version} %endif +%description macros-devel +Macros for building RPM packages for OpenMPI version %{version}. + %if 0%{?build_static_devel} %package devel-static Summary: Static libraries for openMPI %{?with_hpc:HPC} version %{version} Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} +%if 0%{?default_openmpi} +Provides: openmpi-devel-static = %{version} +%endif %description devel-static OpenMPI is an implementation of the Message Passing Interface, a @@ -390,6 +401,8 @@ ############################################################################# %build +export USER=OBS +export HOSTNAME=OBS %global _lto_cflags %{_lto_cflags} -ffat-lto-objects %{?with_hpc:%hpc_debug} ./autogen.pl --force @@ -507,6 +520,17 @@ EOF +mkdir -p %{buildroot}%{_sysconfdir}/rpm +cat <<EOF >%{buildroot}%{_sysconfdir}/rpm/macros.openmpi +# +# openmpi +# +%setup_openmpi source %{mpi_bindir}/mpivars.sh + +%openmpi_requires Requires: %{name}-libs +%openmpi_devel_requires Requires: %{name}-devel + +EOF %else %hpc_write_modules_files #%%Module1.0##################################################################### @@ -690,10 +714,12 @@ %defattr(-, root, root, -) %{mpi_mandir} -%if %{with hpc} %files macros-devel %defattr(-,root,root,-) +%if %{with hpc} %config %{_sysconfdir}/rpm/macros.hpc-openmpi +%else +%config %{_sysconfdir}/rpm/macros.openmpi %endif %if 0%{?build_static_devel}
