From 1c42f8c56bbbfafa7879a78c6f71ed453ee02c52 Mon Sep 17 00:00:00 2001
From: alakatos <alakatos@redhat.com>
Date: Tue, 18 Jun 2024 10:13:32 +0200
Subject: [PATCH] Disable building for i686 Update Requires list on selinux
 subpackage Resolves: RHEL-37322

---
 usbguard.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/usbguard.spec b/usbguard.spec
index 9387e29..849fc71 100644
--- a/usbguard.spec
+++ b/usbguard.spec
@@ -6,7 +6,7 @@
 
 Name:           usbguard
 Version:        1.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tool for implementing USB device usage policy
 License:        GPL-2.0-or-later
 ## Not installed
@@ -16,7 +16,7 @@ Source0:        https://github.com/USBGuard/usbguard/releases/download/%{name}-%
 Source1:        https://github.com/USBGuard/usbguard-selinux/archive/refs/tags/v%{semodule_version}.tar.gz#/%{name}-selinux-%{semodule_version}.tar.gz
 Source2:        https://github.com/Cropi/%{name}-notifier/releases/download/%{name}-notifier-%{notifier_version}/%{name}-notifier-%{notifier_version}.tar.gz
 Source3:        usbguard-daemon.conf
-
+ExcludeArch:    i686
 
 Requires: systemd
 Requires(post): systemd
@@ -45,6 +45,7 @@ BuildRequires: audit-libs-devel
 BuildRequires: systemd
 
 Patch1: usbguard-revert-catch.patch
+Patch2: disable-console-logging.patch
 
 %description
 The USBGuard software framework helps to protect your computer against rogue USB
@@ -88,7 +89,6 @@ a D-Bus interface to the USBGuard daemon component.
 %package        selinux
 Summary:        USBGuard selinux
 Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
 Requires:       selinux-policy-%{selinuxtype}
 Requires(post): selinux-policy-%{selinuxtype}
 BuildRequires:  selinux-policy-devel
@@ -124,6 +124,7 @@ device presence changes and displays them as pop-up notifications.
 %setup -q -D -T -a 2
 
 %patch -P 1 -p1 -b .catch
+%patch -P 2 -p1
 
 # Remove bundled library sources before build
 rm -rf src/ThirdParty/{Catch,PEGTL}
@@ -287,6 +288,11 @@ fi
 
 
 %changelog
+* Tue Jun 18 2024 Attila Lakatos <alakatos@redhat.com> - 1.1.3-3
+- Disable building for i686
+- Update Requires list on selinux subpackage
+Resolves: RHEL-37322
+
 * Fri Jun 07 2024 Attila Lakatos <alakatos@redhat.com> - 1.1.3-2
 - Rebase to 1.1.3
 - Update usbguard-selinux subpackage