Hello community,
here is the log from the commit of package imb for openSUSE:Factory checked in
at 2019-04-04 15:22:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imb (Old)
and /work/SRC/openSUSE:Factory/.imb.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imb"
Thu Apr 4 15:22:53 2019 rev:4 rq:691465 version:2019.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/imb/imb.changes 2019-02-20 14:11:52.702928513
+0100
+++ /work/SRC/openSUSE:Factory/.imb.new.3908/imb.changes 2019-04-04
15:29:26.894945183 +0200
@@ -1,0 +2,15 @@
+Thu Apr 4 10:07:03 UTC 2019 - Christian Goll <cg...@suse.com>
+
+- Obsoletes now the imb package without flavor suffixes
+
+-------------------------------------------------------------------
+Wed Apr 3 14:38:42 UTC 2019 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- Fix non-hpc flavor builds
+
+-------------------------------------------------------------------
+Wed Apr 3 13:59:29 UTC 2019 - Christian Goll <cg...@suse.com>
+
+- added mpi library as suffix to name of the rpm (bsc#1131424)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imb.spec ++++++
--- /var/tmp/diff_new_pack.81ycZg/_old 2019-04-04 15:29:31.198946840 +0200
+++ /var/tmp/diff_new_pack.81ycZg/_new 2019-04-04 15:29:31.202946841 +0200
@@ -131,9 +131,13 @@
%endif
%if %{without hpc}
-%define p_bindir /usr/%_lib/mpi/gcc/%{mpi_flavor}/bin
+%define p_bindir /usr/%_lib/mpi/gcc/%{flavor}/bin
+%if "%{flavor}" == ""
%define package_name %{pname}
%else
+%define package_name %{pname}-%{flavor}
+%endif
+%else
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m {%mpi_flavor}
%{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
%define package_name %{hpc_package_name %_ver}
%define p_bindir %hpc_bindir
@@ -148,9 +152,10 @@
Url: https://software.intel.com/en-us/articles/intel-mpi-benchmarks
Source0:
https://github.com/intel/mpi-benchmarks/archive/v%{version}.tar.gz#/%{pname}_%{version}.tar.gz
%if %{without hpc}
-BuildRequires: %{mpi_flavor}-devel
+BuildRequires: %{flavor}-devel
BuildRequires: gcc
BuildRequires: gcc-c++
+Obsoletes: imb
%else
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires:
%{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
@@ -171,8 +176,8 @@
%build
%if %{without hpc}
-%define makeargs CC=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpicc
CXX=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpic++
-. /usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpivars.sh
+%define makeargs CC=/usr/%_lib/mpi/gcc/%{flavor}/bin/mpicc
CXX=/usr/%_lib/mpi/gcc/%{flavor}/bin/mpic++
+. /usr/%_lib/mpi/gcc/%{flavor}/bin/mpivars.sh
%else
%{hpc_setup}
%define makeargs CC=mpicc CXX=mpic++
