From 3a6261d03ea1abb345f22e6590aa53a0916db46c Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Jun 15 2021 21:16:17 +0000
Subject: update to 3.8.0


---

diff --git a/singularity.spec b/singularity.spec
index 1cc8412..f58e5d9 100644
--- a/singularity.spec
+++ b/singularity.spec
@@ -21,20 +21,22 @@
 # 
 # 
 
-%define singgopath src/github.com/hpcng/singularity
-
 # Disable debugsource packages; otherwise it ends up with an empty %files
 #   file in debugsourcefiles.list on Fedora
 %undefine _debugsource_packages
 
+# This can be slightly different than %{version}.
+# For example, it has dash instead of tilde for release candidates.
+%define package_version 3.8.0
+
 Summary: Application and environment virtualization
 Name: singularity
-Version: 3.7.4
+Version: 3.8.0
 Release: 1%{?dist}
 # https://spdx.org/licenses/BSD-3-Clause-LBNL.html
 License: BSD-3-Clause-LBNL
-URL: https://www.sylabs.io/singularity/
-Source: %{name}-3.7.4.tar.gz
+URL: https://singularity.hpcng.org
+Source: %{name}-%{package_version}.tar.gz
 ExclusiveOS: linux
 # RPM_BUILD_ROOT wasn't being set ... for some reason
 %if "%{sles_version}" == "11"
@@ -93,12 +95,15 @@ mkdir %{name}-%{version}
 %build
 cd %{name}-%{version}
 
-mkdir -p gopath/%{singgopath}
-tar -C "gopath/src/github.com/hpcng/" -xf "%SOURCE0"
+# Setup an empty GOPATH for the build
+mkdir -p gopath
 
 export GOPATH=$PWD/gopath
 export PATH=$GOPATH/bin:$PATH
-cd $GOPATH/%{singgopath}
+
+# Perform the build outside of GOPATH as we are using go modules
+tar -xf "%SOURCE0"
+cd %{name}-%{package_version}
 
 # 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.
@@ -123,9 +128,12 @@ make old_config=
 %install
 cd %{name}-%{version}
 
+# Setup an empty GOPATH for the build
 export GOPATH=$PWD/gopath
 export PATH=$GOPATH/bin:$PATH
-cd $GOPATH/%{singgopath}/builddir
+
+# 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
@@ -160,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT install man
 
 
 %changelog
+* Tue Jun 15 2021 Dave Dykstra <dwd@fedoraproject.org> - 3.8.0-1
+- Upgrade to upstream 3.8.0
+
 * Wed May 26 2021 Dave Dykstra <dwd@fedoraproject.org> - 3.7.4-1
 - Upgrade to upstream security release 3.7.4
 
diff --git a/sources b/sources
index 855541b..b5d138c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (singularity-3.7.4.tar.gz) = e34c77476c17f93164de0fbaaa489b0af57b1de1eabc3867b4ebf743f75486b88cb6da90fa96a371ae2401e0c0c40146d455ba1478e1a48d2a149bd7cea8def0
+SHA512 (singularity-3.8.0.tar.gz) = b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272