From 98d4ccd5ce38ff2503be1a67ccc68f1083cfcc564a6dd641f712cc1430ba9593 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 29 Nov 2019 17:23:52 +0000 Subject: [PATCH] Accepting request 752454 from home:eeich:branches:multimedia:libs - Disable openmpi1 builds for SLE/Leap > 15.1. - Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). OBS-URL: https://build.opensuse.org/request/show/752454 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=78 --- fftw3.changes | 6 ++++++ fftw3.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fftw3.changes b/fftw3.changes index e4bb2b2..01d7d8b 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 29 15:00:55 UTC 2019 - Egbert Eich + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + ------------------------------------------------------------------- Fri Sep 13 16:00:11 UTC 2019 - Michel Normand diff --git a/fftw3.spec b/fftw3.spec index 4f9d69d..5ddb8a8 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -33,9 +33,10 @@ %bcond_with ringdisabled -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI3 -%else +%if 0%{?sle_version} >= 150200 +%define DisOMPI1 ExclusiveArch: do_not_build +%endif +%if 0%{!?is_opensuse:1} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif