[rpms/apptainer] migrate-spdx: Move obsoletes to suid subpackage

[Carl George <carl@george.computer>]

            A new commit has been pushed.

            Repo   : rpms/apptainer
            Branch : migrate-spdx
            Commit : c119cfa517d381bfd22793c064187d2a889a8dd3
            Author : Carl George <carl@george.computer>
            Date   : 2022-12-21T15:33:38-06:00
            Stats  : +10/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/apptainer/c/c119cfa517d381bfd22793c064187d2a889a8dd3?branch=migrate-spdx

            Log:
            Move obsoletes to suid subpackage

Having apptainer-suid obsolete singularity (instead of apptainer)
mitigates one of the incompatibilies introduced with apptainer by
avoiding defaulting to unprivileged user namespaces.

---
diff --git a/apptainer.spec b/apptainer.spec
index 2d0427b..d56af0f 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -55,13 +55,6 @@ Patch11: https://github.com/vasi/squashfuse/pull/77.patch
 Patch12: https://github.com/vasi/squashfuse/pull/81.patch
 %endif
 
-# This package is a rename of the singularity package.  The last shipped
-# singularity EVR was 0:3.8.7-3.fc37, therefore the obsoletes must be one
-# release higher to not gratuitously polluting the version space upwards.
-# Originally this package provided singularity, but after discussion of the
-# incompatibilities introduced in apptainer it was deemed not sufficiently
-# compatible.
-Obsoletes: singularity < 3.8.7-4
 # In the singularity 2.x series there was a singularity-runtime package
 #  that could have been installed independently, but starting in 3.x
 #  there was only one package
@@ -112,6 +105,15 @@ containers that can be used across host environments.
 %package suid
 Summary: Setuid component of Apptainer
 Requires: %{name} = %{version}-%{release}
+# The singularity package was renamed to apptainer.  However, this also brought
+# several incompatibilities, including defaulting to unprivileged user
+# namespaces.  Installing this subpackage allows apptainer to run without
+# unprivileged user namespaces, mitigating one of the incompatibilities.
+# Because of this, we'll put the renaming obsoletes in this subpackage instead
+# of at the top level.  The last shipped singularity EVR was 0:3.8.7-3.fc37,
+# therefore the obsoletes must be one release higher to not gratuitously
+# polluting the version space upwards.
+Obsoletes: singularity < 3.8.7-4
 
 %description suid
 Provides the optional setuid-root portion of Apptainer.
@@ -235,6 +237,7 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 - Reduce singularity obsoletes upper bound
 - Remove singularity provides due to incompatibilities introduced in apptainer
 - Add the word singularity to the summary so it shows up in dnf search results
+- Move obsoletes to suid subpackage
 
 * Tue Dec 13 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.4
 - Update to upstream 1.1.4.