Accepting request 557428 from home:StefanBruens:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/557428
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=14

fwupd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec 14 18:40:06 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+- Fix dependencies and build options for non-x86 architectures. At
+  least FW updates for USB are arch independent, and EFI FW updates
+  can also be applied on Aarch64.
+
 -------------------------------------------------------------------
 Fri Oct 27 09:17:53 UTC 2017 - dimstar@opensuse.org
 

fwupd.spec

@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%ifarch %{ix86} x86_64 aarch64
+%bcond_without efi_fw_update
+%else
+%bcond_with efi_fw_update
+%endif
 
 Name:           fwupd
 Version:        1.0.0
@@ -43,17 +48,19 @@ BuildRequires:  python3-xml
 BuildRequires:  pkgconfig(appstream-glib) >= 0.5.10
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(colorhug) >= 1.2.12
+%if %{with efi_fw_update}
 BuildRequires:  pkgconfig(efiboot)
 BuildRequires:  pkgconfig(efivar)
 #!BuildIgnore: shim
-BuildRequires:  gobject-introspection-devel
 BuildRequires:  pkgconfig(fwup) >= 5
+%endif
 BuildRequires:  pkgconfig(gio-2.0) >= 2.25.9
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.45.8
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  gobject-introspection-devel
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk-doc) >= 1.14
 BuildRequires:  pkgconfig(gudev-1.0)
@@ -62,7 +69,9 @@ BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libelf)
 # BuildRequires:  pkgconfig(libtbtfwu) >= 1
 BuildRequires:  pkgconfig(libgcab-1.0)
+%ifarch %{ix86} x86_64
 BuildRequires:  pkgconfig(libsmbios_c) >= 2.3.0
+%endif
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.51.92
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
 BuildRequires:  pkgconfig(sqlite3)
@@ -123,7 +132,16 @@ if this gets used on other non-desktop hardware.
 %setup -q
 
 %build
+# Dell support requires direct SMBIOS access,
+# Synaptics requires Dell support, i.e. x86 only
 %{meson} \
+%if %{without efi_fw_update}
+  -Denable-uefi=false \
+%endif
+%ifnarch %{ix86} x86_64
+  -Denable-dell=false \
+  -Denable-synaptics=false \
+%endif
   -Denable-tests=false
 %{meson_build}