Hello community, here is the log from the commit of package mpich for openSUSE:Factory checked in at 2018-01-09 14:54:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpich (Old) and /work/SRC/openSUSE:Factory/.mpich.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpich" Tue Jan 9 14:54:39 2018 rev:5 rq:562438 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mpich/mpich.changes 2017-11-03 16:27:53.461570209 +0100 +++ /work/SRC/openSUSE:Factory/.mpich.new/mpich.changes 2018-01-09 14:54:40.611628991 +0100 @@ -1,0 +2,8 @@ +Fri Jan 5 18:37:08 UTC 2018 - [email protected] + +- Add gcc7 as additional compiler flavor for HPC on SLES. +- Fix library package requires - use HPC macro (boo#1074890). +- Fix mpich HPC installation path in spec file. +- Fix hpc macros: add %mpich_requires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpich.spec ++++++ --- /var/tmp/diff_new_pack.5hd11J/_old 2018-01-09 14:54:41.519586428 +0100 +++ /var/tmp/diff_new_pack.5hd11J/_new 2018-01-09 14:54:41.523586240 +0100 @@ -1,7 +1,7 @@ # # spec file for package mpich # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,6 +82,36 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu7-hpc" +%define compiler_family gnu +%define c_f_ver 7 +%define build_flavor verbs +%define build_static_devel 1 +%{bcond_without hpc} +%endif +%if "%flavor" == "gnu7-hpc-testsuite" +%define compiler_family gnu +%define c_f_ver 7 +%define testsuite 1 +%define build_flavor verbs +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu7-hpc-ofi" +%define compiler_family gnu +%define c_f_ver 7 +%define build_flavor ofi +%define build_static_devel 1 +%{bcond_without hpc} +%endif +%if "%flavor" == "gnu7-hpc-ofi-testsuite" +%define compiler_family gnu +%define c_f_ver 7 +%define testsuite 1 +%define build_flavor ofi +%{bcond_without hpc} +%endif + %if "%{build_flavor}" != "verbs" %define pack_suff %{?build_flavor:-%{build_flavor}} %endif @@ -109,7 +139,7 @@ %define package_name %{pname}%{?pack_suff}_%{_vers}-%{compiler_family}%{?c_f_ver}-hpc %global hpc_mpich_dep_version %(VER=%{?m_f_ver}; echo -n ${VER}) -%global hpc_mpich_dir mvapich +%global hpc_mpich_dir mpich %global hpc_mpich_pack_version %{hpc_mpich_dep_version} %endif @@ -164,7 +194,7 @@ BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod BuildRequires: suse-hpc -Requires: lua-lmod +%hpc_requires %endif %if 0%{?testsuite} @@ -314,7 +344,7 @@ %if 0%{?testsuite} # Remove everything from testsuite package -# It is all contained by mvapich2 packages +# It is all contained by mpich packages rm -rf %{buildroot}/* %check ++++++ macros.hpc-mpich ++++++ --- /var/tmp/diff_new_pack.5hd11J/_old 2018-01-09 14:54:41.583583427 +0100 +++ /var/tmp/diff_new_pack.5hd11J/_new 2018-01-09 14:54:41.583583427 +0100 @@ -4,14 +4,17 @@ %hpc_mpich_init(V:) \ %{-V: %define _mf_ver %{-V*}} \ - %{expand: %%global hpc_mpich_dep_version %%{?_mf_ver}%%{!?_mf_ver:3}} \ + %{expand: %%global hpc_mpich_dep_version %%{?_mf_ver}} \ %{expand: %%global hpc_mpich_dir mpich%{hpc_mpich_dep_version}} \ - %{expand: %%global hpc_mpich_pack_version %{hpc_mpich_dep_version}} + %global hpc_mpich_pack_version %{hpc_mpich_dep_version} # We may have to add a version here. %hpc_setup_mpich \ module load mpich +%hpc_mpich_requires \ +Requires: mpich%{hpc_mpich_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc + %hpc_mpich_requires_devel \ Requires: mpich%{hpc_mpich_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc-devel
