[rpms/apptainer] migrate-spdx: fix 32-bit compiles

[rpms/apptainer] migrate-spdx: fix 32-bit compiles

[Dave Dykstra]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : ef86907bd441557e92bdec9303c08edc31514f10
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2024-02-15T17:28:13-06:00
Stats  : +9/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/ef86907bd441557e92bdec9303c08edc31514f10?branch=migrate-spdx

Log:
fix 32-bit compiles

---
diff --git a/.gitignore b/.gitignore
index 54e5c88..a9a86b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-/apptainer-*.tar.gz
+/apptainer-*
 /e2fsprogs-*
-/fuse2fs-*
 /gocryptfs-*
 /squashfuse-*
-/fuse-overlayfs-1.13.tar.gz
+/fuse-overlayfs-*

diff --git a/apptainer.spec b/apptainer.spec
index 582f199..f917860 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -52,6 +52,8 @@ Release: 1%{?dist}
 License: BSD and LBNL BSD and ASL 2.0
 URL: https://apptainer.org
 Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz
+# Temporary fix for https://github.com/apptainer/apptainer/issues/2023
+Patch1: apptainer-1.patch
 
 %if "%{?gocryptfs_version}" != ""
 # In order to build offline, this source tarball needs to have the "vendor"
@@ -62,6 +64,8 @@ Source10: https://github.com/rfjakob/gocryptfs/archive/v%{gocryptfs_version}/goc
 %endif
 %if "%{?squashfuse_version}" != ""
 Source11: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
+# URL: https://github.com/vasi/squashfuse/pull/126.patch
+Patch101: squashfuse-1.patch
 %endif
 %if "%{?e2fsprogs_version}" != ""
 # URL: https://github.com/tytso/e2fsprogs/archive/refs/tags/v%{e2fsprogs_version}.tar.gz
@@ -314,6 +318,7 @@ Provides the optional setuid-root portion of Apptainer.
 
 %prep
 %setup -n %{name}-%{package_version}
+%patch1 -p1
 # don't need to setup dependent source packages and patches because
 # that is done by the compile-dependencies script
 

diff --git a/sources b/sources
index be53048..d9f373b 100644
--- a/sources
+++ b/sources
@@ -6,3 +6,5 @@ SHA512 (e2fsprogs-3.patch) = 005a27c46972e88e63b8d35132d9e041e481081bad3a05fd8be
 SHA512 (fuse-overlayfs-1.13.tar.gz) = 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b
 SHA512 (squashfuse-0.5.0.tar.gz) = 7e081cf066ade784ced6bbd6edfee5714e2704c09cbfd46166388eb966d39cf4b792adc54c287546e50cef70e2728689e351933cc318add2cb1fc2ddd98e8f1a
 SHA512 (apptainer-1.3.0-rc.2.tar.gz) = 348454139377bab5c5869f59c9fc47573906481a79fa25d206c12b54b51b555ab80b4858bf7946f3adee7a56da4041c7c09c23718f12774512309941224a223b
+SHA512 (squashfuse-1.patch) = c4b886394f2b3b01fb5d8b9179302402d91406bb847d4ce611a71aa6db44eaa1fbab2d9801e97f2275eecdc8416247c38f7f6ee766397a70cf1a63855649b773
+SHA512 (apptainer-1.patch) = 1b38a74afef90945a9376fa5d0d7bbb7d272ffff838fa6549b918867380ada761a1ec5b3509a6ac2e92345d13076cada5599504830c0d106da10076a916d2914