Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocr for openSUSE:Factory checked in
at 2021-02-11 12:49:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocr (Old)
and /work/SRC/openSUSE:Factory/.ocr.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocr"
Thu Feb 11 12:49:22 2021 rev:5 rq:870975 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocr/ocr.changes 2020-05-14 23:26:03.241145901
+0200
+++ /work/SRC/openSUSE:Factory/.ocr.new.28504/ocr.changes 2021-02-11
12:52:46.485950546 +0100
@@ -1,0 +2,7 @@
+Wed Feb 10 18:10:34 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Add build support for gcc10 to HPC build (bsc#1174439).
+- Add openmpi4 flavors (jsc#SLE-16462).
+- Fix mpi_ver -> mpi_vers.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocr.spec ++++++
--- /var/tmp/diff_new_pack.eojurG/_old 2021-02-11 12:52:47.005951262 +0100
+++ /var/tmp/diff_new_pack.eojurG/_new 2021-02-11 12:52:47.009951268 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocr
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,14 @@
%if 0%{?sle_version} >= 150200
%define DisOMPI1 ExclusiveArch: do_not_build
%endif
+%if !0%{?is_opensuse} && 0%{?sle_version:1}
+%if 0%{?sle_version} < 150200
+%define DisOMPI3 ExclusiveArch: do_not_build
+%endif
+%if 0%{?sle_version} < 150200
+%define DisOMPI4 ExclusiveArch: do_not_build
+%endif
+%endif
# Build options
@@ -81,7 +89,72 @@
%{?DisOMPI3}
%endif
-%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m
{%mpi_family}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
+%if "%{flavor}" == "gnu-openmpi4-hpc"
+%define compiler_family gnu
+%undefine c_f_ver
+%global mpi_family openmpi
+%define mpi_vers 4
+%bcond_without mpi
+%{?DisOMPI4}
+%endif
+#
+%if "%{flavor}" == "gnu10-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%bcond_with mpi
+%endif
+
+%if "%{flavor}" == "gnu10-mvapich2-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family mvapich2
+%bcond_without mpi
+%endif
+
+%if "%{flavor}" == "gnu10-mpich-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family mpich
+%bcond_without mpi
+%endif
+
+%if "%{flavor}" == "gnu10-openmpi-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family openmpi
+%define mpi_vers 1
+%bcond_without mpi
+%{?DisOMPI1}
+%endif
+
+%if "%{flavor}" == "gnu10-openmpi2-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family openmpi
+%define mpi_vers 2
+%bcond_without mpi
+%{?DisOMPI2}
+%endif
+
+%if "%{flavor}" == "gnu10-openmpi3-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family openmpi
+%define mpi_vers 3
+%bcond_without mpi
+%{?DisOMPI3}
+%endif
+
+%if "%{flavor}" == "gnu10-openmpi4-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_family openmpi
+%define mpi_vers 4
+%bcond_without mpi
+%{?DisOMPI4}
+%endif
+
+%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m
{%mpi_family}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
%{?hpc_package_name:%define package_name %{hpc_package_name %_ver}}
Name: %package_name
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.eojurG/_old 2021-02-11 12:52:47.049951323 +0100
+++ /var/tmp/diff_new_pack.eojurG/_new 2021-02-11 12:52:47.053951329 +0100
@@ -2,6 +2,7 @@
<package>gnu-openmpi-hpc</package>
<package>gnu-openmpi2-hpc</package>
<package>gnu-openmpi3-hpc</package>
+ <package>gnu-openmpi4-hpc</package>
<package>gnu-mvapich2-hpc</package>
<package>gnu-mpich-hpc</package>
<package>gnu-hpc</package>
