From bd48960387184390837725b6c5acb0f281ba83f8b5a572f432ae0c4c3f731716 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 5 Apr 2024 07:13:45 +0000
Subject: [PATCH] Accepting request 1165430 from home:dimstar:Factory

- dbxtool is built unconditionally on all architectures: move it
  out of the condition in the files section and also
  unconditionally provide/obsolete the old version.

OBS-URL: https://build.opensuse.org/request/show/1165430
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=173
---
 fwupd.changes | 7 +++++++
 fwupd.spec    | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fwupd.changes b/fwupd.changes
index e4e9aef..fc05daa 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  5 07:08:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- dbxtool is built unconditionally on all architectures: move it
+  out of the condition in the files section and also
+  unconditionally provide/obsolete the old version.
+
 -------------------------------------------------------------------
 Tue Mar 12 07:53:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/fwupd.spec b/fwupd.spec
index 1cb2236..93769f7 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -127,10 +127,10 @@ BuildRequires:  pkgconfig(efivar) >= 33
 %ifarch %{ix86} x86_64
 BuildRequires:  pkgconfig(libsmbios_c) >= 2.3.0
 %endif
-%if %{with efi_fw_update}
 Obsoletes:      dbxtool <= 8
-Obsoletes:      fwupdate <= 12
 Provides:       dbxtool
+%if %{with efi_fw_update}
+Obsoletes:      fwupdate <= 12
 %ifarch x86_64 aarch64
 Requires:       shim >= 11
 Requires:       udisks2
@@ -317,8 +317,8 @@ rm -fr %{buildroot}%{_datadir}/fish
 %if %{with efi_fw_update}
 %{_bindir}/fwupdagent
 %{_bindir}/fwupdate
-%{_bindir}/dbxtool
 %endif
+%{_bindir}/dbxtool
 %{_sbindir}/rc%{name}
 %{_sbindir}/rcfwupd-offline-update
 %{_sbindir}/rcfwupd-refresh