From 707607d839de5274277b790904106f75c677cd11 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 2 Feb 2023 17:17:37 +0100 Subject: [PATCH] images: Ensure that the gpg2(1), gnupg2(7), etc. manuals are available It turns out that at least since Fedora 30 [1], the gnupg2 package has been part of the fedora base image, because it's required by the dnf package: dnf -> python3-dnf -> python3-libdnf -> libdnf -> gpgme -> gnupg2 Hence, the need to restore the gnupg2 documentation that was stripped out in the base image. Only the images for currently maintained Fedoras (ie., 36, 37 and 38) were updated. [1] It's difficult to find out if the gnupg2 package wasn't part of the fedora base image before Fedora 30, because those images are no longer available from registry.fedoraproject.org. https://github.com/containers/toolbox/pull/1228 --- images/fedora/f36/ensure-files | 3 +++ images/fedora/f36/missing-docs | 1 + images/fedora/f37/ensure-files | 3 +++ images/fedora/f37/missing-docs | 1 + images/fedora/f38/ensure-files | 3 +++ images/fedora/f38/missing-docs | 1 + 6 files changed, 12 insertions(+) diff --git a/images/fedora/f36/ensure-files b/images/fedora/f36/ensure-files index 24b89a0..9693d36 100644 --- a/images/fedora/f36/ensure-files +++ b/images/fedora/f36/ensure-files @@ -6,6 +6,9 @@ /usr/share/man/man1/cp.1* /usr/share/man/man1/ls.1* +/usr/share/man/man1/gpg2.1* +/usr/share/man/man7/gnupg2.7* + /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/f36/missing-docs b/images/fedora/f36/missing-docs index 2350648..b06fdc3 100644 --- a/images/fedora/f36/missing-docs +++ b/images/fedora/f36/missing-docs @@ -4,6 +4,7 @@ coreutils-common curl findutils gawk +gnupg2 grep gzip libcap diff --git a/images/fedora/f37/ensure-files b/images/fedora/f37/ensure-files index 24b89a0..9693d36 100644 --- a/images/fedora/f37/ensure-files +++ b/images/fedora/f37/ensure-files @@ -6,6 +6,9 @@ /usr/share/man/man1/cp.1* /usr/share/man/man1/ls.1* +/usr/share/man/man1/gpg2.1* +/usr/share/man/man7/gnupg2.7* + /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/missing-docs b/images/fedora/f37/missing-docs index 2350648..b06fdc3 100644 --- a/images/fedora/f37/missing-docs +++ b/images/fedora/f37/missing-docs @@ -4,6 +4,7 @@ coreutils-common curl findutils gawk +gnupg2 grep gzip libcap diff --git a/images/fedora/f38/ensure-files b/images/fedora/f38/ensure-files index 24b89a0..9693d36 100644 --- a/images/fedora/f38/ensure-files +++ b/images/fedora/f38/ensure-files @@ -6,6 +6,9 @@ /usr/share/man/man1/cp.1* /usr/share/man/man1/ls.1* +/usr/share/man/man1/gpg2.1* +/usr/share/man/man7/gnupg2.7* + /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/missing-docs b/images/fedora/f38/missing-docs index 2350648..b06fdc3 100644 --- a/images/fedora/f38/missing-docs +++ b/images/fedora/f38/missing-docs @@ -4,6 +4,7 @@ coreutils-common curl findutils gawk +gnupg2 grep gzip libcap