From 523db91a78c9e332f71f4d003c3b7a847afb2d64 Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Feb 09 2022 19:16:56 +0000
Subject: Update to 3.8.6


---

diff --git a/singularity.spec b/singularity.spec
index ea03686..00871e6 100644
--- a/singularity.spec
+++ b/singularity.spec
@@ -27,19 +27,17 @@
 
 # This can be slightly different than %{version}.
 # For example, it has dash instead of tilde for release candidates.
-%define package_version 3.8.5
-
-%define goversion 1.16.12
+%define package_version 3.8.6
 
 Summary: Application and environment virtualization
 Name: singularity
-Version: 3.8.5
-Release: 2%{?dist}
+Version: 3.8.6
+Release: 1%{?dist}
 # https://spdx.org/licenses/BSD-3-Clause-LBNL.html
 License: BSD-3-Clause-LBNL
 URL: https://singularity.hpcng.org
 Source: %{name}-%{package_version}.tar.gz
-Source1: go%{goversion}.src.tar.gz
+
 ExclusiveOS: linux
 # RPM_BUILD_ROOT wasn't being set ... for some reason
 %if "%{sles_version}" == "11"
@@ -98,18 +96,6 @@ mkdir %{name}-%{version}
 %build
 cd %{name}-%{version}
 
-%if "%{?SOURCE1}" != ""
-# build the go tool chain from source, because the default on most OSes has
-#  a security flaw we want to avoid.
-pushd ..
-tar -xf %SOURCE1
-cd go/src
-./make.bash
-cd ../..
-export PATH=$PWD/go/bin:$PATH
-popd
-%endif
-
 # Setup an empty GOPATH for the build
 mkdir -p gopath
 
@@ -120,6 +106,21 @@ export PATH=$GOPATH/bin:$PATH
 tar -xf "%SOURCE0"
 cd %{name}-%{package_version}
 
+%if "%{?SOURCE1}" != ""
+GOVERSION="$(echo %SOURCE1|sed 's,.*/,,;s/go//;s/\.src.*//')"
+if ! ./mlocal/scripts/check-min-go-version go $GOVERSION; then
+	# build the go tool chain, the existing version is too old
+	pushd ..
+	tar -xf %SOURCE1
+	cd go/src
+	./make.bash
+	cd ../..
+	export PATH=$PWD/go/bin:$PATH
+	popd
+fi
+%endif
+
+
 # Not all of these parameters currently have an effect, but they might be
 #  used someday.  They are the same parameters as in the configure macro.
 ./mconfig -V %{version}-%{release} \
@@ -152,8 +153,7 @@ export PATH=$GOPATH/bin:$PATH
 # Enter the source builddir for the install
 cd %{name}-%{package_version}/builddir
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-make DESTDIR=$RPM_BUILD_ROOT install man
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %if "%{suse_version}" == "11"
 %clean
@@ -185,6 +185,9 @@ make DESTDIR=$RPM_BUILD_ROOT install man
 
 
 %changelog
+* Wed Feb  9 2022 Dave Dykstra <dwd@fedoraproject.org> - 3.8.6-1
+- Upgrade to upstream 3.8.6
+
 * Tue Dec 14 2021 Dave Dykstra <dwd@fedoraproject.org> - 3.8.5-2
 - Rebuild using golang-1.16.12
 
diff --git a/sources b/sources
index 1f8259f..60b2c2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (singularity-3.8.5.tar.gz) = 857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
-SHA512 (go1.16.12.src.tar.gz) = 01a641b1c52890ff375f62761db4d87f7207297c7971951ba9305aa99313b5ba3014cb7555096a8fd04c97c208d2432d71d94aa9134d1617f8bedb203aa91b58
+SHA512 (singularity-3.8.6.tar.gz) = dd20a083505503d274d075574c4efaa4e59829d751d4836a7ba9095b9e88c3ce83e2203a194ede42e2c3dba22ed16546f97d980e7ba05021b94ec3dfa6ee309f