public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/apptainer] f45: fix merge error
@ 2026-09-22 17:03 Dave Dykstra
  0 siblings, 0 replies; only message in thread
From: Dave Dykstra @ 2026-09-22 17:03 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : f45
Commit : abf1fe1010599f8229932d40020cd3f1863a89cd
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2026-09-22T12:03:53-05:00
Stats  : +1/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/abf1fe1010599f8229932d40020cd3f1863a89cd?branch=f45

Log:
fix merge error

---
diff --git a/apptainer.spec b/apptainer.spec
index 67e0a35..777f5af 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -34,7 +34,7 @@
 %global e2fsprogs_version 1.47.4
 %global fuse_overlayfs_version 1.16
 %global squashfs_tools_version 4.7.5
-%ifnarch ppc64le s390x
+%ifnarch ppc64le s390x riscv64
 %if !(0%{?fedora} >= 45 || 0%{?rhel} >= 11) || "%{_arch}" != "x86_64"
 # On fedora45 & epel11 x86_64 building PRoot dies with
 # "relocation truncated to fit: R_X86_64_PC32 against `.rodata'"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-22 17:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 17:03 [rpms/apptainer] f45: fix merge error Dave Dykstra

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox