From 77372249287ece5e283eb900dc5278a8b8328b65 Mon Sep 17 00:00:00 2001 From: renxichen Date: Wed, 6 Sep 2023 17:04:00 +0800 Subject: [PATCH] Fix a copy-paste error in --help --- ...-help-description-of-whatconflicts-R.patch | 26 +++++++++++++++++++ rpm.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch diff --git a/backport-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch b/backport-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch new file mode 100644 index 0000000..ad4d1e7 --- /dev/null +++ b/backport-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.27.0 + diff --git a/rpm.spec b/rpm.spec index a9614f5..ef029c8 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.18.1 -Release: 6 +Release: 7 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -28,6 +28,7 @@ Patch6006: backport-Fix-rpmDigestBundleFinal-and-Update-return-code-on-i.patch Patch6007: backport-Actually-return-an-error-in-parseScript-if-parsing-f.patch Patch6008: backport-Check-inside-root-when-querying-for-files.patch Patch6009: backport-Fix-a-segfault-on-a-non-stringable-argument-to-macro.patch +Patch6010: backport-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch Patch9000: Add-digest-list-plugin.patch Patch9001: Add-IMA-digest-list-support.patch @@ -323,6 +324,9 @@ make clean %exclude %{_mandir}/man8/rpmspec.8.gz %changelog +* Wed Sep 06 2023 renhongxun - 4.18.1-7 +- Fix a copy-paste error in --help + * Tue Sep 05 2023 renhongxun - 4.18.1-6 - Fix the coredump which may occur during upgrading of rpm