public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
To: git-commits@fedoraproject.org
Subject: [rpms/apptainer] f45: fix merge error
Date: Tue, 22 Sep 2026 17:03:59 GMT [thread overview]
Message-ID: <179009663997.1.7503760715802307308.rpms-apptainer-abf1fe101059@fedoraproject.org> (raw)
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'"
reply other threads:[~2026-09-22 17:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179009663997.1.7503760715802307308.rpms-apptainer-abf1fe101059@fedoraproject.org \
--to=2129743+drdaved@users.noreply.github.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox