[rpms/apptainer] migrate-spdx: Add pivot provides/conflict of sif-runtime

[rpms/apptainer] migrate-spdx: Add pivot provides/conflict of sif-runtime

[Carl George]

            A new commit has been pushed.

            Repo   : rpms/apptainer
            Branch : migrate-spdx
            Commit : cd98d30eefafa57d85bf517b7cc7d971dea6858a
            Author : Carl George <carl@george.computer>
            Date   : 2022-12-14T16:02:27-06:00
            Stats  : +10/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/apptainer/c/cd98d30eefafa57d85bf517b7cc7d971dea6858a?branch=migrate-spdx

            Log:
            Add pivot provides/conflict of sif-runtime

Multiple packages contain /usr/bin/singularity and /usr/bin/run-singularity,
which are necessary to run SIF images.  Use a pivot provides/conflicts to
avoid them all needing to conflict with each other.

---
diff --git a/apptainer.spec b/apptainer.spec
index 951bfe1..5a22fc2 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -39,7 +39,7 @@
 Summary: Application and environment virtualization
 Name: apptainer
 Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -66,6 +66,12 @@ Obsoletes: singularity < 1:4.0
 Provides: singularity-runtime = 2:%{version}-%{release}
 Obsoletes: singularity-runtime < 3.0
 
+# Multiple packages contain /usr/bin/singularity and /usr/bin/run-singularity,
+# which are necessary to run SIF images.  Use a pivot provides/conflicts to
+# avoid them all needing to conflict with each other.
+Provides: sif-runtime
+Conflicts: sif-runtime
+
 %if "%{_target_vendor}" == "suse"
 BuildRequires: binutils-gold
 %endif
@@ -223,6 +229,9 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Wed Dec 14 2022 Carl George <carl@george.computer> - 1.1.4-2
+- Add pivot provides/conflict of sif-runtime
+
 * Tue Dec 13 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.4
 - Update to upstream 1.1.4.