[rpms/apptainer] migrate-spdx: update to 1.1.0-rc.2

[rpms/apptainer] migrate-spdx: update to 1.1.0-rc.2

[Dave Dykstra]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 0231cf711fd62eead7d1c13c909cd04af20988d1
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2022-08-17T12:02:00-05:00
Stats  : +15/-6 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/0231cf711fd62eead7d1c13c909cd04af20988d1?branch=migrate-spdx

Log:
update to 1.1.0-rc.2

---
diff --git a/apptainer.spec b/apptainer.spec
index 302df50..c081418 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,12 +31,12 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.1.0-rc.1
+%global package_version 1.1.0-rc.2
 
 Summary: Application and environment virtualization
 Name: apptainer
-Version: 1.1.0~rc.1
-Release: 2%{?dist}
+Version: 1.1.0~rc.2
+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)
 # See LICENSE_DEPENDENCIES.md for dependencies
@@ -44,7 +44,10 @@ Release: 2%{?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/590.patch
+%if 0%{?fedora} == 35
+# Include golang source because f35 does not have a new enough version
+Source1: go1.17.12.src.tar.gz
+%endif
 
 # The singularity package was renamed to apptainer after version 3.8.x.
 # The apptainer package reset numbering at 1.0.0, and some singularity
@@ -77,6 +80,8 @@ Requires: fakeroot
 Requires: fuse-overlayfs
 %if 0%{?el7}
 Requires: fuse2fs
+%else
+Requires: e2fsprogs
 %endif
 
 %description
@@ -91,7 +96,7 @@ Requires: %{name} = %{version}-%{release}
 Provides the optional setuid-root portion of Apptainer.
 
 %prep
-%autosetup -p1 -n %{name}-%{package_version}
+%autosetup -n %{name}-%{package_version}
 
 %build
 %if "%{?SOURCE1}" != ""
@@ -169,6 +174,10 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Tue Aug 17 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.0~rc.2
+- Update to upstream 1.1.0~rc.2.  Remove customizations put into
+  1.1.0-rc.1 packaging except for f35 inclusion of golang source.
+
 * Tue Aug  2 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.0~rc.1-2
 - Add patch for 32-bit compilation
 

diff --git a/sources b/sources
index 403495c..d521293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apptainer-1.1.0-rc.1.tar.gz) = bf105ac10e7d5dd795198e25847951543f343afc0df3b9e19ab9c974f1e7835dd271f67261631bd8079f6d54450e40ddc6def96795cf7b8bd6e65b592f5dc870
+SHA512 (apptainer-1.1.0-rc.2.tar.gz) = f4335439fa0fa7fc061deab359ee6edcc5e49f6a392216ee40d3c5bf07a00dabdfc3cee48a845c04017ab0ca7a3311e26c369669f488a1661cee2da2fd7b0741