From 01897aee43e67c803cde9fe417f3bd260aa7d26d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 16 Jun 2025 20:38:04 +0200 Subject: [PATCH] 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 a8b4975b5ccc52a4161a9ff21a2e9a2f6c0f7407. [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 --- toolbox.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/toolbox.spec b/toolbox.spec index 5860757..0950133 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -33,7 +33,7 @@ Version: 0.1.1 %endif %endif -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for interactive command line environments on Linux License: Apache-2.0 @@ -91,11 +91,9 @@ Recommends: fuse-overlayfs %endif Requires: containers-common +Requires: flatpak-session-helper Requires: podman >= 1.6.4 Requires: shadow-utils-subid%{?_isa} -%if ! 0%{?rhel} -Requires: flatpak-session-helper -%endif %description @@ -210,6 +208,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %changelog +* Mon Jun 16 2025 Debarshi Ray - 0.1.1-2 +- Add 'Requires: flatpak-session-helper' +Resolves: RHEL-97099 + * Fri Nov 01 2024 Debarshi Ray - 0.1.1-1 - Update to 0.1.1 Resolves: RHEL-61904