[rpms/apptainer] migrate-spdx: add patch to accept pre-release go versions

[rpms/apptainer] migrate-spdx: add patch to accept pre-release go versions

[Dave Dykstra]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 024429dbf491d15b3675ba869f87e6d0a1c9802a
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2022-03-03T12:27:27-06:00
Stats  : +84/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/024429dbf491d15b3675ba869f87e6d0a1c9802a?branch=migrate-spdx

Log:
add patch to accept pre-release go versions

---
diff --git a/299.patch b/299.patch
new file mode 100644
index 0000000..b085c3d
--- /dev/null
+++ b/299.patch
@@ -0,0 +1,82 @@
+From b3a0df014bd54506a0803604516c6bbfd6c09f5e Mon Sep 17 00:00:00 2001
+From: Dave Dykstra <dwd@fnal.gov>
+Date: Wed, 9 Feb 2022 13:44:04 -0600
+Subject: [PATCH 1/2] ignore prelease part of go version
+
+Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
+---
+ mlocal/scripts/check-min-go-version | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mlocal/scripts/check-min-go-version b/mlocal/scripts/check-min-go-version
+index bb57f5a49..3c79c3c58 100755
+--- a/mlocal/scripts/check-min-go-version
++++ b/mlocal/scripts/check-min-go-version
+@@ -17,6 +17,10 @@ if [ "$GOMINOR" = "$GOPATCH" ]; then
+ else
+     GOMINOR="${GOMINOR/.*}"
+ fi
++# ignore GO pre-release extensions
++if ! [[ $GOMINOR =~ ^[0-9]$ ]]; then
++    GOMINOR="$(echo $GOMINOR|sed 's/^\([0-9]*\).*/\1/')"
++fi
+ 
+ MINVERSION="$2"
+ MINMAJOR="${MINVERSION/.*}"
+
+From 65ed96c677d788f7d4e96d70c8ebe515d7ec1a43 Mon Sep 17 00:00:00 2001
+From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
+Date: Wed, 9 Feb 2022 16:02:48 -0600
+Subject: [PATCH 2/2] shellcheck updates
+
+Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
+---
+ mlocal/scripts/check-min-go-version | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/mlocal/scripts/check-min-go-version b/mlocal/scripts/check-min-go-version
+index 3c79c3c58..387401e39 100755
+--- a/mlocal/scripts/check-min-go-version
++++ b/mlocal/scripts/check-min-go-version
+@@ -18,8 +18,9 @@ else
+     GOMINOR="${GOMINOR/.*}"
+ fi
+ # ignore GO pre-release extensions
+-if ! [[ $GOMINOR =~ ^[0-9]$ ]]; then
+-    GOMINOR="$(echo $GOMINOR|sed 's/^\([0-9]*\).*/\1/')"
++if ! [[ "$GOMINOR" =~ ^[0-9]$ ]]; then
++    # shellcheck disable=SC2001
++    GOMINOR="$(echo "$GOMINOR"|sed 's/^\([0-9]*\).*/\1/')"
+ fi
+ 
+ MINVERSION="$2"
+@@ -32,16 +33,16 @@ else
+     MINMINOR="${MINMINOR/.*}"
+ fi
+ 
+-if [ $GOMAJOR -lt $MINMAJOR ]; then
++if [ "$GOMAJOR" -lt "$MINMAJOR" ]; then
+     exit 1
+ fi
+-if [ $GOMAJOR -gt $MINMAJOR ]; then
++if [ "$GOMAJOR" -gt "$MINMAJOR" ]; then
+     exit 0
+ fi
+-if [ $GOMINOR -lt $MINMINOR ]; then
++if [ "$GOMINOR" -lt "$MINMINOR" ]; then
+     exit 1
+ fi
+-if [ $GOMINOR -gt $MINMINOR ]; then
++if [ "$GOMINOR" -gt "$MINMINOR" ]; then
+     exit 0
+ fi
+ if [ -z "$MINPATCH" ]; then
+@@ -50,7 +51,7 @@ fi
+ if [ -z "$GOPATCH" ]; then
+     exit 1
+ fi
+-if [ $GOPATCH -lt $MINPATCH ]; then
++if [ "$GOPATCH" -lt "$MINPATCH" ]; then
+     exit 1
+ fi
+ exit 0

diff --git a/apptainer.spec b/apptainer.spec
index e08f4eb..3b9146f 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -44,7 +44,7 @@ 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
-
+Patch: https://github.com/apptainer/apptainer/pull/299.patch
 # The singularity package was renamed to apptainer after version 3.8.x.
 # The apptainer package reset numbering at 1.0.0, so Provide corresponding
 #  singularity versions in the next epoch.
@@ -76,7 +76,7 @@ Apptainer provides functionality to make portable
 containers that can be used across host environments.
 
 %prep
-%autosetup -n %{name}-%{package_version}
+%autosetup -n %{name}-%{package_version} -p1
 
 %build
 %if "%{?SOURCE1}" != ""