Hello community, here is the log from the commit of package openmpi2 for openSUSE:Factory checked in at 2018-01-19 11:49:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi2 (Old) and /work/SRC/openSUSE:Factory/.openmpi2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi2" Fri Jan 19 11:49:41 2018 rev:11 rq:566631 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi2/openmpi2.changes 2017-12-13 11:56:41.829519202 +0100 +++ /work/SRC/openSUSE:Factory/.openmpi2.new/openmpi2.changes 2018-01-19 11:49:43.093522792 +0100 @@ -1,0 +2,8 @@ +Wed Jan 17 09:55:44 UTC 2018 - [email protected] + +- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES. +- Fix library package requires - use HPC macro (boo#1074890) +- Fix rpm macro file. +- Only build openmpi2-config for the standard flavor + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi2.spec ++++++ --- /var/tmp/diff_new_pack.sy1rVG/_old 2018-01-19 11:49:43.989480554 +0100 +++ /var/tmp/diff_new_pack.sy1rVG/_new 2018-01-19 11:49:43.993480364 +0100 @@ -1,7 +1,7 @@ # # spec file for package openmpi2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. @@ -80,9 +80,9 @@ %undefine c_f_ver %endif -%if "%flavor" == "gnu6-hpc" +%if "%flavor" == "gnu7-hpc" %define compiler_family gnu -%define c_f_ver 6 +%define c_f_ver 7 %endif %if "%flavor" == "gnu-hpc-testsuite" @@ -91,9 +91,9 @@ %define testsuite 1 %endif -%if "%flavor" == "gnu6-hpc-testsuite" +%if "%flavor" == "gnu7-hpc-testsuite" %define compiler_family gnu -%define c_f_ver 6 +%define c_f_ver 7 %define testsuite 1 %endif @@ -170,7 +170,7 @@ %if 0%{!?testsuite:1} Requires: lib%{package_name} = %{version} %endif -Requires: lua-lmod +%hpc_requires %endif %ifarch %{ix86} x86_64 @@ -328,6 +328,7 @@ the dynamic library and headers. %endif +%if %{without hpc} %package -n %{pname}%{m_f_ver}-config Summary: Runtime configuration files for openMPI %{?with_hpc:HPC} version %{version} Group: Development/Libraries/Parallel @@ -342,6 +343,7 @@ such as latency or throughput. This RPM contains the configuration files for OpenMPI runtime (Version 1 or 2). +%endif %if %{with hpc} %{hpc_master_package -L -a} @@ -533,6 +535,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{S:3} %{buildroot}%{_sysconfdir}/rpm +# Drop the files that should go into %{pname}-config as we only package them +# in the non HPC build +rm -f %{buildroot}%{_sysconfdir}/openmpi-default-hostfile +rm -f %{buildroot}%{_sysconfdir}/openmpi-mca-params.conf +rm -f %{buildroot}%{_sysconfdir}/openmpi-totalview.tcl %endif %if %{without hpc} @@ -669,10 +676,12 @@ %{mpi_libdir}/openmpi/*.a %endif +%if %{without hpc} %files -n %{pname}%{m_f_ver}-config %config %{_sysconfdir}/openmpi-default-hostfile %config %{_sysconfdir}/openmpi-mca-params.conf %{_sysconfdir}/openmpi-totalview.tcl +%endif %endif # !?testsuite ++++++ macros.hpc-openmpi ++++++ --- /var/tmp/diff_new_pack.sy1rVG/_old 2018-01-19 11:49:44.057477348 +0100 +++ /var/tmp/diff_new_pack.sy1rVG/_new 2018-01-19 11:49:44.061477159 +0100 @@ -4,7 +4,17 @@ %hpc_openmpi_init(V:) \ %{-V: %define _mf_ver %{-V*}} \ - %{expand: %%global hpc_openmpi_dep_version %%{?_mf_ver}%%{!_mf_ver:2}}; \ + %{expand: %%global hpc_openmpi_dep_version %%{?_mf_ver}%%{?!_mf_ver:2}} \ %{expand: %%global hpc_openmpi_dir openmpi%{hpc_openmpi_dep_version}} \ %{expand: %%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}} +# We may have to add a version here. +%hpc_setup_openmpi \ + module load openmpi + +%hpc_openmpi_requires \ +Requires: libopenmpi%{hpc_openmpi_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc + +%hpc_openmpi_requires_devel \ +Requires: openmpi%{hpc_openmpi_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc-devel +
