From 9f04dce2a11ef5a44e7455e164aaef8fdc75f6d2452628b3038605044da5dab7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 27 Jul 2020 05:56:09 +0000 Subject: [PATCH] Accepting request 822889 from home:yfjiang:branches:Base:System - Build the package separately for openSUSE and SLE using _multibuild (jsc#SLE-11744). OBS-URL: https://build.opensuse.org/request/show/822889 OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=73 --- _multibuild | 4 ++++ fwupd.changes | 6 ++++++ fwupd.spec | 21 ++++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..0f6de97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + openSUSE + SLE + diff --git a/fwupd.changes b/fwupd.changes index 1f45d1f..15dc548 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 24 06:52:18 UTC 2020 - Yifan Jiang + +- Build the package separately for openSUSE and SLE using + _multibuild (jsc#SLE-11744). + ------------------------------------------------------------------- Wed Jun 03 15:32:46 UTC 2020 - dimstar@opensuse.org diff --git a/fwupd.spec b/fwupd.spec index c3668a8..3ac0376 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -17,16 +17,35 @@ # needssslcertforbuild +%define flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "" +ExclusiveArch: %{nil} +%else +%define branding_name %{flavor} +%if "%{flavor}" == "SLE" +%define build_SLE 1 +%else +%define build_openSUSE 1 +%endif +%endif + +%if (0%{?build_SLE} && 0%{?is_opensuse}) || (0%{?build_openSUSE} && ! 0%{?is_opensuse}) +# Don't build SLE branding on openSUSE and vice-versa +ExclusiveArch: %{nil} +%endif + %ifarch %{ix86} x86_64 aarch64 %bcond_without efi_fw_update %else %bcond_with efi_fw_update %endif -%if 0%{?is_opensuse} +%if 0%{?build_openSUSE} %global efidir opensuse %else %global efidir sles %endif + Name: fwupd Version: 1.4.2 Release: 0