Accepting request 845856 from home:gary_lin:branches:Base:System

- Amend the spec file (jsc#SLE-16818)
  + Only enable fish support for Tumbleweed
  + Only enable the MSR plugin for x86
  + Only install dbxtool in the architectures with UEFI support

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

fwupd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov  3 07:22:31 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Amend the spec file (jsc#SLE-16818)
+  + Only enable fish support for Tumbleweed
+  + Only enable the MSR plugin for x86
+  + Only install dbxtool in the architectures with UEFI support
+
 -------------------------------------------------------------------
 Mon Nov 02 15:57:37 UTC 2020 - dimstar@opensuse.org
 

fwupd.spec

@@ -23,6 +23,12 @@
 %bcond_with efi_fw_update
 %endif
 
+%if 0%{?suse_version} > 1500
+%bcond_without fish_support
+%else
+%bcond_with fish_support
+%endif
+
 Name:           fwupd
 Version:        1.5.1
 Release:        0
@@ -40,7 +46,9 @@ Patch1:         fwupd-bsc1130056-change-shim-path.patch
 Patch2:         fwupd-jscSLE-11766-close-efidir-leap-gap.patch
 
 BuildRequires:  dejavu-fonts
+%if %{with fish_support}
 BuildRequires:  fish
+%endif
 BuildRequires:  gcab
 # for certtool
 BuildRequires:  gnutls
@@ -188,6 +196,7 @@ done
 %ifnarch %{ix86} x86_64
   -Dplugin_dell=false \
   -Dplugin_synaptics=false \
+  -Dplugin_msr=false \
 %endif
   -Dgtkdoc=true \
   -Dtests=false
@@ -216,6 +225,10 @@ FWUPD_EFI=`basename %{buildroot}/%{_libexecdir}/fwupd/efi/fwupd*.efi`
 ln -s %{_libexecdir}/fwupd/efi/$FWUPD_EFI %{buildroot}/%{_libexecdir}/fwupd/efi/$FWUPD_EFI.signed
 %endif
 
+%if %{without fish_support}
+rm -fr %{buildroot}%{_datadir}/fish
+%endif
+
 %post   -n libfwupd2 -p /sbin/ldconfig
 %postun -n libfwupd2 -p /sbin/ldconfig
 
@@ -258,7 +271,9 @@ fi
 %{_unitdir}/fwupd-refresh.service
 %{_unitdir}/fwupd-refresh.timer
 %{_libexecdir}/fwupd
+%if %{with efi_fw_update}
 %{_bindir}/dbxtool
+%endif
 %{_bindir}/fwupdagent
 %if %{with efi_fw_update}
 %{_bindir}/fwupdate
@@ -288,7 +303,9 @@ fi
 %{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml
 %{_datadir}/%{name}/quirks.d/*.quirk
 %{_datadir}/%{name}/remotes.d/vendor/firmware/README.md
+%if %{with efi_fw_update}
 %{_mandir}/man1/dbxtool.1%{?ext_man}
+%endif
 %{_mandir}/man1/fwupdagent.1%{?ext_man}
 %if %{with efi_fw_update}
 %{_mandir}/man1/fwupdate.1%{?ext_man}
@@ -296,7 +313,9 @@ fi
 %{_mandir}/man1/fwupdmgr.1%{?ext_man}
 %{_mandir}/man1/fwupdtool.1%{?ext_man}
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
+%ifarch %{ix86} x86_64
 %{_sysconfdir}/modules-load.d/fwupd-msr.conf
+%endif
 %{_sysconfdir}/modules-load.d/fwupd-platform-integrity.conf
 %config %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/pki
@@ -317,7 +336,9 @@ fi
 %{_datadir}/bash-completion/completions/fwupdmgr
 %{_datadir}/bash-completion/completions/fwupdtool
 %{_datadir}/bash-completion/completions/fwupdagent
+%if %{with fish_support}
 %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish
+%endif
 %{_datadir}/icons/hicolor/*
 %{_prefix}/lib/systemd/system-shutdown/fwupd.shutdown
 %{_prefix}/lib/systemd/system-preset/fwupd-refresh.preset