[rpms/apptainer] migrate-spdx: update to 1.0.1

[Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 0bca6cda77e819310bbe42c78c6c9b2a86e0edf4
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2022-03-16T17:02:37-05:00
Stats  : +9/-88 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/0bca6cda77e819310bbe42c78c6c9b2a86e0edf4?branch=migrate-spdx

Log:
update to 1.0.1

---
diff --git a/299.patch b/299.patch
deleted file mode 100644
index b085c3d..0000000
--- a/299.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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 3b9146f..7d31fa3 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,11 +31,11 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.0.0
+%global package_version 1.0.1
 
 Summary: Application and environment virtualization
 Name: apptainer
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD)
 # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0)
@@ -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} -p1
+%autosetup -n %{name}-%{package_version}
 
 %build
 %if "%{?SOURCE1}" != ""
@@ -151,6 +151,9 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 %doc CHANGELOG.md
 
 %changelog
+* Wed Mar 16 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.0.1
+- Update to upstream 1.0.1
+- Remove patch from pr 299, not needed anymore
+
 * Thu Mar 03 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.0.0
 - Initial release from upstream 1.0.0
-

diff --git a/sources b/sources
index 9936842..758e9f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apptainer-1.0.0.tar.gz) = c772b9286d54b21112dba98b7361fac7e1661616643851dc12f58b2565a51d145806f8e5b5dc635b357526e5d270bea096498dcd6c40635530ec3beced6f582f
+SHA512 (apptainer-1.0.1.tar.gz) = 273e94a348be2eaf83cf14b4c72a571670a9fa5cd185a90a0f557ba58ea7eb90d3a0f4bdb749673b0009e2291dd994dc715223c38ce82f9fcd6bf142e7692363