From 9f5076542473d43a3ba1766f0318ddd48311e290 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 16 Nov 2023 10:09:54 +0100 Subject: [PATCH] Fix description of whatconflicts in the man page Resolves: RHEL-6303 --- ...-help-description-of-whatconflicts-R.patch | 26 +++++++++++++++++++ rpm.spec | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch diff --git a/0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch b/0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch new file mode 100644 index 0000000..63cc183 --- /dev/null +++ b/0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch @@ -0,0 +1,26 @@ +From 03525592c944957f3b7b200b7daeb9f615cdcde7 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +Date: Tue, 23 May 2023 12:46:22 +0300 +Subject: [PATCH] Fix a copy-paste --help description of --whatconflicts + (RhBug:2208661) + +--- + lib/poptQV.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/poptQV.c b/lib/poptQV.c +index ac8e8975d..8bd91c652 100644 +--- a/lib/poptQV.c ++++ b/lib/poptQV.c +@@ -108,7 +108,7 @@ struct poptOption rpmQVSourcePoptTable[] = { + { "verify", 'V', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V', + N_("rpm verify mode"), NULL }, + { "whatconflicts", '\0', 0, 0, POPT_WHATCONFLICTS, +- N_("query/verify the package(s) which require a dependency"), "CAPABILITY" }, ++ N_("query/verify the package(s) which conflict with a dependency"), "CAPABILITY" }, + { "whatrequires", '\0', 0, 0, POPT_WHATREQUIRES, + N_("query/verify the package(s) which require a dependency"), "CAPABILITY" }, + { "whatobsoletes", '\0', 0, 0, POPT_WHATOBSOLETES, +-- +2.41.0 + diff --git a/rpm.spec b/rpm.spec index 72bdddc..5c8bbfd 100644 --- a/rpm.spec +++ b/rpm.spec @@ -102,6 +102,7 @@ Patch129: 0001-Swap-over-to-dirfd-basename-based-operation-within-t.patch Patch130: 0001-Use-file-state-machine-from-rpm-4.19.patch Patch131: 0001-Fix-short-circuiting-of-version-strings-in-expressio.patch +Patch132: 0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch @@ -653,6 +654,7 @@ fi %changelog * Thu 16 Nov 2023 Florian Festi - 4.16.1.3-27 - Fix short circuiting of version strings in expressions (RHEL-15688) +- Fix description of whatconflicts in the man page (RHEL-6303) * Fri Nov 10 2023 Florian Festi - 4.16.1.3-26 - Backport file handling code from rpm-4.19 to fix CVE-2021-35937,