From 46c17c0a48df0d5a1d3c95ab601f75fa495d8ac0 Mon Sep 17 00:00:00 2001 From: John Wass Date: Thu, 16 Nov 2023 15:01:04 -0500 Subject: [PATCH] Fixes an issue building in i686 and removes excluded arches from spec An updated Rust ring crate made it possible to build on s390 and power64 arches. That update was present in #905 but was not enabled in the spec until now. Closes #947 Closes #948 --- crates/auparse/sys/src/event.rs | 2 +- fapolicy-analyzer.spec | 4 ---- scripts/srpm/fapolicy-analyzer.el9.spec | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/crates/auparse/sys/src/event.rs b/crates/auparse/sys/src/event.rs index 3e7064607..feeddd3c9 100644 --- a/crates/auparse/sys/src/event.rs +++ b/crates/auparse/sys/src/event.rs @@ -25,7 +25,7 @@ impl Event { } pub fn ts(&self) -> i64 { - unsafe { auparse_get_time(self.au.as_ptr()) } + unsafe { auparse_get_time(self.au.as_ptr()).into() } } pub fn int(&self, name: &str) -> Result { unsafe { audit_get_int(self.au.as_ptr(), name) } diff --git a/fapolicy-analyzer.spec b/fapolicy-analyzer.spec index cd5afc204..7a7096ce0 100644 --- a/fapolicy-analyzer.spec +++ b/fapolicy-analyzer.spec @@ -58,10 +58,6 @@ Requires: gnome-icon-theme Requires: webkit2gtk3 Requires: mesa-dri-drivers -# rust-ring-devel does not support s390x and ppc64le: -# https://bugzilla.redhat.com/show_bug.cgi?id=1869980 -ExcludeArch: s390x %{power64} - %global module fapolicy_analyzer # pep440 versions handle dev and rc differently, so we call them out explicitly here %global module_version %{lua: v = string.gsub(rpm.expand("%{?version}"), "~dev", ".dev"); \ diff --git a/scripts/srpm/fapolicy-analyzer.el9.spec b/scripts/srpm/fapolicy-analyzer.el9.spec index 999e74ed9..200f1b1c9 100644 --- a/scripts/srpm/fapolicy-analyzer.el9.spec +++ b/scripts/srpm/fapolicy-analyzer.el9.spec @@ -131,10 +131,6 @@ Requires: gnome-icon-theme Requires: webkit2gtk3 Requires: mesa-dri-drivers -# rust-ring-devel does not support s390x and ppc64le: -# https://bugzilla.redhat.com/show_bug.cgi?id=1869980 -ExcludeArch: s390x %{power64} - %global module fapolicy_analyzer %global venv_dir %{_builddir}/vendor-py