Revert "Don't 'Requires: flatpak-session-helper' on RHEL"

The org.freedesktop.Flatpak D-Bus service provided by the
flatpak-session-helper RPM is not just needed to use containers created
by Toolbx < 0.0.97 [1,2].

It's needed on the host when toolbox(1) invocations inside a container
are forwarded to the host with 'flatpak-spawn --host ...'.  This has
been true since Toolbx >= 0.0.6 [3], and, hence, flatpak-session-helper
is needed on RHEL.

This reverts commit a8b4975b5c.

[1] Upstream commit 82c32bea742621a3
    https://github.com/containers/toolbox/commit/82c32bea742621a3
    https://github.com/containers/toolbox/pull/591
    https://github.com/containers/toolbox/issues/267

[2] Upstream commit 71b5c8c0a235249b
    https://github.com/containers/toolbox/commit/71b5c8c0a235249b
    https://github.com/containers/toolbox/pull/591
    https://github.com/containers/toolbox/issues/267

[3] Upstream commit 5b3d234c9e9ef45f
    https://github.com/containers/toolbox/commit/5b3d234c9e9ef45f
    https://github.com/containers/toolbox/pull/54

Resolves: RHEL-97099
This commit is contained in:
Debarshi Ray 2025-06-16 20:38:04 +02:00
parent de49d99fa0
commit 01897aee43

View File

@ -33,7 +33,7 @@ Version: 0.1.1
%endif %endif
%endif %endif
Release: 1%{?dist} Release: 2%{?dist}
Summary: Tool for interactive command line environments on Linux Summary: Tool for interactive command line environments on Linux
License: Apache-2.0 License: Apache-2.0
@ -91,11 +91,9 @@ Recommends: fuse-overlayfs
%endif %endif
Requires: containers-common Requires: containers-common
Requires: flatpak-session-helper
Requires: podman >= 1.6.4 Requires: podman >= 1.6.4
Requires: shadow-utils-subid%{?_isa} Requires: shadow-utils-subid%{?_isa}
%if ! 0%{?rhel}
Requires: flatpak-session-helper
%endif
%description %description
@ -210,6 +208,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%changelog %changelog
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-2
- Add 'Requires: flatpak-session-helper'
Resolves: RHEL-97099
* Fri Nov 01 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-1 * Fri Nov 01 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-1
- Update to 0.1.1 - Update to 0.1.1
Resolves: RHEL-61904 Resolves: RHEL-61904