From abfdf870fe7ed1bfa69960affe9eeb651cc6f06e477bdddd70c5d04dcb9460bd Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 17 Dec 2018 15:59:00 +0000
Subject: [PATCH] Accepting request 657350 from
 home:gary_lin:branches:Base:System

- Add pesign-obs-integration to BuildRequires and add fwupd*.efi to
  BRP_PESIGN_FILES to get it signed
- Add LC_IMAGES and use efivar only if %{with efi_fw_update}
  + Also update the version requirement of efivar
- Disable Redfish and NVME plugins if %{without efi_fw_update}
  since those two plugins require efivar
- Remove fwup from BuildRequires since fwupdate is already merged
  into fwupd.

OBS-URL: https://build.opensuse.org/request/show/657350
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=41
---
 fwupd.changes | 12 ++++++++++++
 fwupd.spec    |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/fwupd.changes b/fwupd.changes
index 03bfa22..e8b34c4 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Dec 11 04:25:11 UTC 2018 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Add pesign-obs-integration to BuildRequires and add fwupd*.efi to
+  BRP_PESIGN_FILES to get it signed
+- Add LC_IMAGES and use efivar only if %{with efi_fw_update}
+  + Also update the version requirement of efivar
+- Disable Redfish and NVME plugins if %{without efi_fw_update}
+  since those two plugins require efivar
+- Remove fwup from BuildRequires since fwupdate is already merged
+  into fwupd.
+
 -------------------------------------------------------------------
 Mon Dec 10 10:17:50 UTC 2018 - schwab@suse.de
 
diff --git a/fwupd.spec b/fwupd.spec
index a7f77d3..397e931 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -14,6 +14,7 @@
 
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
+# needssslcertforbuild
 
 
 %ifarch %{ix86} x86_64 aarch64
@@ -57,7 +58,6 @@ BuildRequires:  pkgconfig(appstream-glib) >= 0.5.10
 BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(colorhug) >= 1.2.12
-BuildRequires:  pkgconfig(efivar)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.25.9
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.45.8
@@ -80,8 +80,9 @@ BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(valgrind)
 %if %{with efi_fw_update}
 BuildRequires:  gnu-efi
+BuildRequires:  pesign-obs-integration
 BuildRequires:  pkgconfig(efiboot)
-BuildRequires:  pkgconfig(fwup) >= 10
+BuildRequires:  pkgconfig(efivar) >= 33
 %endif
 %ifarch %{ix86} x86_64
 BuildRequires:  pkgconfig(libsmbios_c) >= 2.3.0
@@ -146,6 +147,8 @@ done
 # Synaptics requires Dell support, i.e. x86 only
 %meson \
 %if %{without efi_fw_update}
+  -Dplugin_nvme=false \
+  -Dplugin_redfish=false \
   -Dplugin_uefi=false \
 %endif
 %ifnarch %{ix86} x86_64
@@ -156,6 +159,7 @@ done
 %meson_build
 
 %install
+export BRP_PESIGN_FILES='%{_libexecdir}/fwupd/efi/fwupd*.efi'
 %meson_install
 # README.md is packaged as doc
 rm %{buildroot}%{_localstatedir}/lib/fwupd/builder/README.md