From 7c7b43b61c8b6e74a3a8cf80d49f7fb0e2e0dc6e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 26 Mar 2019 16:03:03 +0100 Subject: [PATCH] Add the toolbox-support and toolbox-experience subpackages These are intended to be installed into the image if the image doesn't use the fedora-toolbox container as the base image - all the packages are already preinstalled there. The support subpackage should be installed to images that intent to work flawlessly with toolbox. The experience subpackage should be installed as well, to provide the same experience while working in the container as one would get on the host. https://src.fedoraproject.org/rpms/toolbox/pull-request/1 --- toolbox.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/toolbox.spec b/toolbox.spec index d983724..0d604b8 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -27,6 +27,73 @@ Obsoletes: fedora-toolbox < 0.0.5-2 Toolbox is offers a familiar RPM based environment for developing and debugging software that runs fully unprivileged using Podman. +# The list of requires packages for -support and -experience should be in sync with: +# https://github.com/debarshiray/toolbox/blob/master/images/fedora/f31/extra-packages +%package support +Summary: Required packages for the container image to support %{name} + +# These are really required to make the image work with toolbox +Requires: passwd +Requires: shadow-utils +Requires: krb5-libs +Requires: vte-profile + +%description support +The %{name}-support package contains all the required packages that are needed +to be installed in the container image to make it work with the %{name}. + +The %{name}-support package should be typically installed from the Dockerfile +if the image isn't based on the fedora-toolbox image. + + +%package experience +Summary: Set of packages to enhance the %{name} experience + +Requires: bash-completion +Requires: bzip2 +Requires: diffutils +Requires: dnf-plugins-core +Requires: findutils +Requires: flatpak-xdg-utils +Requires: fpaste +Requires: git +Requires: gnupg +Requires: gnupg2-smime +Requires: hostname +Requires: iputils +Requires: jwhois +Requires: keyutils +Requires: less +Requires: lsof +Requires: man-db +Requires: man-pages +Requires: mlocate +Requires: mtr +Requires: openssh-clients +Requires: PackageKit-command-not-found +Requires: pigz +Requires: procps-ng +Requires: rsync +Requires: sudo +Requires: tcpdump +Requires: time +Requires: traceroute +Requires: tree +Requires: unzip +Requires: wget +Requires: which +Requires: words +Requires: xz +Requires: zip + +%description experience +The %{name}-experience package contains all the packages that should be +installed in the container to provide the same default experience as working +on the host. + +The %{name}-experience package should be typically installed from the +Dockerfile if the image isn't based on the fedora-toolbox image. + %prep %autosetup @@ -54,6 +121,10 @@ debugging software that runs fully unprivileged using Podman. %{_mandir}/man1/%{name}-*.1* %{_tmpfilesdir}/%{name}.conf +%files support + +%files experience + %changelog * Thu Mar 14 2019 Debarshi Ray - 0.0.7-1