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] rawhide: use new source tarball instead of patch
Date: Thu, 23 Jul 2026 18:13:16 GMT [thread overview]
Message-ID: <178483039602.1.6215939039694960520.rpms-apptainer-207d4661f505@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/apptainer
Branch : rawhide
Commit : 207d4661f5054c8c7fb6e5f0fc836f4ce9e262a9
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date : 2026-07-23T13:13:10-05:00
Stats : +2/-63 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/apptainer/c/207d4661f5054c8c7fb6e5f0fc836f4ce9e262a9?branch=rawhide
Log:
use new source tarball instead of patch
---
diff --git a/3647.patch b/3647.patch
deleted file mode 100644
index c682f85..0000000
--- a/3647.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 19cfb98cbdd32c98d29f1ac83e6013c4e1fd40ae Mon Sep 17 00:00:00 2001
-From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
-Date: Thu, 23 Jul 2026 12:18:30 -0500
-Subject: [PATCH] update golang.org/x/net to v0.55.0
-
-Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
----
- go.mod | 4 ++--
- go.sum | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index af2df0f12..fcd2ea2a0 100644
---- a/go.mod
-+++ b/go.mod
-@@ -48,7 +48,7 @@ require (
- github.com/vbauerster/mpb/v8 v8.12.0
- go.yaml.in/yaml/v4 v4.0.0-rc.4
- golang.org/x/crypto v0.51.0
-- golang.org/x/sys v0.44.0
-+ golang.org/x/sys v0.45.0
- golang.org/x/term v0.43.0
- golang.org/x/text v0.37.0
- gotest.tools/v3 v3.5.2
-@@ -165,7 +165,7 @@ require (
- go.yaml.in/yaml/v2 v2.4.4 // indirect
- go.yaml.in/yaml/v3 v3.0.4 // indirect
- golang.org/x/mod v0.36.0 // indirect
-- golang.org/x/net v0.54.0 // indirect
-+ golang.org/x/net v0.55.0 // indirect
- golang.org/x/sync v0.20.0 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20260511170946-3700d4141b60 // indirect
-diff --git a/go.sum b/go.sum
-index 5d147fc9c..c1afc00c4 100644
---- a/go.sum
-+++ b/go.sum
-@@ -505,8 +505,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
- golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
- golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
- golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
--golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
--golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
-+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
- golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-@@ -547,8 +547,8 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
--golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
--golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
- golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/apptainer.spec b/apptainer.spec
index eea5e0d..18f8e58 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -56,8 +56,7 @@ Release: 2%{?dist}
# License identifiers taken from: https://fedoraproject.org/wiki/Licensing
License: LicenseRef-Callaway-BSD AND BSD-3-Clause-LBNL AND Apache-2.0
URL: https://apptainer.org
-Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz
-Patch0: https://github.com/apptainer/apptainer/pull/3647.patch
+Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}-%{release}.tar.gz
%if "%{?gocryptfs_version}" != ""
# use the release asset that includes vendor directory
@@ -348,7 +347,6 @@ Provides the optional setuid-root portion of Apptainer.
%prep
%setup -n %{name}-%{package_version}
-%patch -P 0 -p1
# don't need to setup dependent source packages and patches because
# that is done by the compile-dependencies script
%if "%{?PRoot_version}" == ""
diff --git a/sources b/sources
index a4000f9..bfbc4ec 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ SHA512 (fuse-overlayfs-1.16.tar.gz) = d72ef0881b788c8f907e0e83bbb5aaa93f37068670
SHA512 (gocryptfs_v2.6.1_src-deps.tar.gz) = ec8a8011a355656c1f242269fcc1559c537e880342e4f71a956a63ac72e47f2d9fea45f6ef308d420282725eb5bd4780f0cd645d137bb6beecb97a9c93b448fb
SHA512 (squashfs-tools-4.7.5.tar.gz) = d24f1c8611dc7dcb17b81f3a34ee8c0d3484141c70ebe7c77c91c966e76cddc671e24d3f4a471ddc819c4708480cdd179168fe2bca8a09e97cebf0da9ef83b1c
SHA512 (squashfuse-0.6.2.tar.gz) = 6eb32c05f5b2cbb94805a8b0f0b1d9a77dc7b582f94316de1be1e4aab19cc8856a50dd4542f4f4c9475c753e63f8a6fad21c0902704643f32422da6a08b21622
-SHA512 (apptainer-1.5.3.tar.gz) = 2f176d04f188f191d12938720eced9d322cc1538a36d5e729ea5fcbcde43a25c6a3ff2a9968f1d29f6cad060acec2f4a77784c69a1c63502daecbd864ffba8c8
+SHA512 (apptainer-1.5.3-2.tar.gz) = 30248b5b6aabf31d0b48e6551936f0ee903b3f5926e8285a9b3b85639fe8da19d69d59e66a7c6f75939785baf8ea92a44fb2dff5f56669dc75b0995cf5fbc2a5
reply other threads:[~2026-07-23 18:13 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=178483039602.1.6215939039694960520.rpms-apptainer-207d4661f505@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