From 1eafe6817a9cdc26b4e90105c89c7806a38f0e2b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 19 Oct 2023 17:28:01 +0200 Subject: [PATCH] images: Add psmisc to Fedora 37, 38 and 39 It's currently being pulled in as a dependency of iproute. However, since it's explicitly mentioned in the list of default packages on Fedora Silverblue and Workstation [1], it should be mentioned here too. The psmisc package marks the translations for its manuals with %lang(). Therefore, it's a very good example for testing that the fedora-toolbox image is localized just like Fedora Silverblue and Workstation. This is unlike the xz package, whose translations for manuals were added to the tests recently [2]. The xz package doesn't mark its translated manuals with %lang() [3], which means that they are going to get installed regardless of whether RPM has been configured to not install localization files or not. eg., through the %_install_langs macro. So, they aren't a good candidate for the tests until this is fixed. [1] fedora-comps commit e4ed54dfcc497fd0 https://pagure.io/fedora-comps/c/e4ed54dfcc497fd0 https://pagure.io/fedora-comps/pull-request/379 [2] Commit 20188a097a1a7a16 https://github.com/containers/toolbox/commit/20188a097a1a7a16 https://github.com/containers/toolbox/pull/1384 [3] https://src.fedoraproject.org/rpms/xz/pull-request/10 --- images/fedora/f37/ensure-files | 4 ++++ images/fedora/f37/extra-packages | 1 + images/fedora/f38/ensure-files | 4 ++++ images/fedora/f38/extra-packages | 1 + images/fedora/f39/ensure-files | 4 ++++ images/fedora/f39/extra-packages | 1 + 6 files changed, 15 insertions(+) diff --git a/images/fedora/f37/ensure-files b/images/fedora/f37/ensure-files index 851baaa46..1450f581f 100644 --- a/images/fedora/f37/ensure-files +++ b/images/fedora/f37/ensure-files @@ -9,6 +9,10 @@ /usr/share/man/man1/gpg2.1* /usr/share/man/man7/gnupg2.7* +/usr/share/man/fr/man1/pstree.1* +/usr/share/man/ko/man1/pstree.1* +/usr/share/man/man1/pstree.1* + /usr/share/man/fr/man8/rpm.8* /usr/share/man/ja/man8/rpm.8* /usr/share/man/man8/rpm.8* diff --git a/images/fedora/f37/extra-packages b/images/fedora/f37/extra-packages index a85268f1f..f07bf58e8 100644 --- a/images/fedora/f37/extra-packages +++ b/images/fedora/f37/extra-packages @@ -28,6 +28,7 @@ openssh-clients passwd pigz procps-ng +psmisc rsync shadow-utils sudo diff --git a/images/fedora/f38/ensure-files b/images/fedora/f38/ensure-files index 851baaa46..1450f581f 100644 --- a/images/fedora/f38/ensure-files +++ b/images/fedora/f38/ensure-files @@ -9,6 +9,10 @@ /usr/share/man/man1/gpg2.1* /usr/share/man/man7/gnupg2.7* +/usr/share/man/fr/man1/pstree.1* +/usr/share/man/ko/man1/pstree.1* +/usr/share/man/man1/pstree.1* + /usr/share/man/fr/man8/rpm.8* /usr/share/man/ja/man8/rpm.8* /usr/share/man/man8/rpm.8* diff --git a/images/fedora/f38/extra-packages b/images/fedora/f38/extra-packages index a85268f1f..f07bf58e8 100644 --- a/images/fedora/f38/extra-packages +++ b/images/fedora/f38/extra-packages @@ -28,6 +28,7 @@ openssh-clients passwd pigz procps-ng +psmisc rsync shadow-utils sudo diff --git a/images/fedora/f39/ensure-files b/images/fedora/f39/ensure-files index 851baaa46..1450f581f 100644 --- a/images/fedora/f39/ensure-files +++ b/images/fedora/f39/ensure-files @@ -9,6 +9,10 @@ /usr/share/man/man1/gpg2.1* /usr/share/man/man7/gnupg2.7* +/usr/share/man/fr/man1/pstree.1* +/usr/share/man/ko/man1/pstree.1* +/usr/share/man/man1/pstree.1* + /usr/share/man/fr/man8/rpm.8* /usr/share/man/ja/man8/rpm.8* /usr/share/man/man8/rpm.8* diff --git a/images/fedora/f39/extra-packages b/images/fedora/f39/extra-packages index a85268f1f..f07bf58e8 100644 --- a/images/fedora/f39/extra-packages +++ b/images/fedora/f39/extra-packages @@ -28,6 +28,7 @@ openssh-clients passwd pigz procps-ng +psmisc rsync shadow-utils sudo