restore some previous behavior

samkenxstream · Nov 8, 2021 · b85aad2 · b85aad2
1 parent 33f8368
commit b85aad2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/dist/rpm/singularity.spec.in b/dist/rpm/singularity.spec.in
@@ -74,9 +74,14 @@ containers that can be used across host environments.
 export RPM_BUILD_ROOT="%{buildroot}"
 %endif
 
+if [ -d %{name}-%{version} ]; then
+    # Clean up old build root
+    # First clean go's modcache because directories are unwritable
+    GOPATH=$PWD/%{name}-%{version}/gopath go clean -modcache
+    rm -rf %{name}-%{version}
+fi
+
 # Create our build root
-chmod -R +w %{name}-%{version} || true
-rm -rf %{name}-%{version}
 mkdir %{name}-%{version}
 
 %build
@@ -118,7 +123,7 @@ make -C builddir old_config=
 cd %{name}-%{version}
 
 export GOPATH=$PWD/gopath
-cd %{name}-@PACKAGE_VERSION@
+cd %{name}-%{package_version}
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 make -C builddir DESTDIR=$RPM_BUILD_ROOT install man