Hello community, here is the log from the commit of package gnu-compilers-hpc for openSUSE:Factory checked in at 2019-08-27 15:20:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu-compilers-hpc (Old) and /work/SRC/openSUSE:Factory/.gnu-compilers-hpc.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnu-compilers-hpc" Tue Aug 27 15:20:05 2019 rev:8 rq:724406 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gnu-compilers-hpc/gnu-compilers-hpc.changes 2019-02-25 17:44:47.642921391 +0100 +++ /work/SRC/openSUSE:Factory/.gnu-compilers-hpc.new.7948/gnu-compilers-hpc.changes 2019-08-27 15:20:07.944878730 +0200 @@ -1,0 +2,8 @@ +Fri Aug 2 05:30:55 UTC 2019 - Egbert Eich <e...@suse.com> + +- Add support for gcc v.6, v.8 and v.9. + for SLE-12 HPC: v.6, v.7, v.8 (jsc#SLE-7765) + for SLE-15 & SLE-15-SP1: gcc v.7, v.8 (jsc#SLE-7766) +- For the base compiler add a Provides: for the versioned form. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu-compilers-hpc.spec ++++++ --- /var/tmp/diff_new_pack.34cLNs/_old 2019-08-27 15:20:08.800878299 +0200 +++ /var/tmp/diff_new_pack.34cLNs/_new 2019-08-27 15:20:08.804878297 +0200 @@ -31,10 +31,22 @@ %undefine c_f_ver %endif +%if "%flavor" == "gnu6-hpc" +%define c_f_ver 6 +%endif + %if "%flavor" == "gnu7-hpc" %define c_f_ver 7 %endif +%if "%flavor" == "gnu8-hpc" +%define c_f_ver 8 +%endif + +%if "%flavor" == "gnu9-hpc" +%define c_f_ver 9 +%endif + # Keep in sync with macros.hpc-gnu %global hpc_gnu_bin_version %{?c_f_ver:-%(echo %c_f_ver | \ sed -e "s@\\([0-9]\\)@\\1.@g" -e "s@\\([0-9]\\)\\.\\$@\\1@g")} @@ -45,6 +57,7 @@ [ ${HPC_CF_FULL_VERSION%%%%.*} -lt 5 ] && \ echo ${HPC_CF_FULL_VERSION%%.*} || \ echo ${HPC_CF_FULL_VERSION%%%%.*} ) +%global hpc_prov_version %{!?c_f_ver:%(var=%hpc_gnu_dep_version; echo ${var/./_})} %global hpc_gnu_pack_version %{?c_f_ver} %if 0%{!?leap_version:1} && 0%{!?sle_version:1} %global hpc_rolling_release_version %(echo %hpc_gnu_dep_version | tr -d '.') @@ -67,6 +80,9 @@ BuildRequires: gcc%{?c_f_ver} BuildRequires: lua-lmod BuildRequires: suse-hpc +%{!?c_f_ver: # +Provides: %{compiler_family}%{?hpc_prov_version}-compilers-hpc = %version-%release +} Requires: lua-lmod BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +96,9 @@ Summary: Devel package for HPC GNU compiler environment Group: Development/Tools/Other BuildArch: noarch +%{!?c_f_ver: # +Provides: %{compiler_family}%{?hpc_prov_version}-compilers-hpc-devel = %version-%release +} Requires: %{name} = %{version} Requires: gcc%{hpc_cf_pack_version} Requires: gcc%{hpc_cf_pack_version}-c++ @@ -99,6 +118,9 @@ Provides: %{pname}-hpc-macros-devel = %{version} Conflicts: otherproviders(%{pname}-hpc-macros-devel) BuildArch: noarch +%{!?c_f_ver: # +Provides: %{compiler_family}%{?hpc_prov_version}-compilers-hpc-macros-devel = %version-%release +} Requires: %{name}-devel = %{version} %description macros-devel @@ -107,6 +129,10 @@ %prep %build +echo "hpc_gnu_full_version: %hpc_gnu_full_version" +echo "hpc_gnu_dep_version: %hpc_gnu_dep_version" +echo "hpc_gnu_bin_version: %hpc_gnu_bin_version" +%{!?c_f_ver:echo "hpc_prov_version: %hpc_prov_version"} %{__cat} <<EOF > %{meta} %{name}-devel is a meta package to ensure installation of the