!228 Sync Pr-223：Fix a copy-paste --help description of --whatconflicts

From: @renxichen 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99

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 <pmatilai@redhat.com>
+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
+

rpm.spec

@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.18.0
-Release:       7
+Release:       8
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -38,6 +38,7 @@ Patch6015: backport-Use-fd-based-ops-for-metadata-in-FA_TOUCH-mode-too-w.patch
 Patch6016: backport-Add-a-test-for-special-device-node-installation.patch
 Patch6017: backport-support-for-POSIX-getopt-behaviour.patch
 Patch6018: backport-Use-proper-type-for-copyTagsFromMainDebug.patch
+Patch6019: backport-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel
 BuildRequires: zlib-devel zstd-devel >= 1.3.8 xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
@@ -324,6 +325,9 @@ make clean
 %exclude %{_mandir}/man8/rpmspec.8.gz
 
 %changelog
+* Wed Jun 14 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-8
+* Fix a copy-paste --help description of --whatconflicts
+
 * Tue Feb 28 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-7
 - bugfix with upstream patches about fifo