Skip to content

Commit

Permalink
Fixes an issue building in i686 and removes excluded arches from spec
Browse files Browse the repository at this point in the history
An updated Rust ring crate made it possible to build on s390 and power64 arches.  That update was present in ctc-oss#905 but was not enabled in the spec until now.

Closes ctc-oss#947
Closes ctc-oss#948
  • Loading branch information
jw3 committed Nov 16, 2023
1 parent 822e76a commit 46c17c0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion crates/auparse/sys/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<i32, Error> {
unsafe { audit_get_int(self.au.as_ptr(), name) }
Expand Down
4 changes: 0 additions & 4 deletions fapolicy-analyzer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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"); \
Expand Down
4 changes: 0 additions & 4 deletions scripts/srpm/fapolicy-analyzer.el9.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 46c17c0

Please sign in to comment.