diff --git a/0001-fix-a-copy-paste-help-description-of-whatconflicts.patch b/0001-fix-a-copy-paste-help-description-of-whatconflicts.patch new file mode 100644 index 0000000000000000000000000000000000000000..f02f4f7489df2c2387e57919eb1d9f3793c9a172 --- /dev/null +++ b/0001-fix-a-copy-paste-help-description-of-whatconflicts.patch @@ -0,0 +1,41 @@ +From a5d0255696890889b73e27a0ad4a57368aef8220 Mon Sep 17 00:00:00 2001 +From: wangkaiqiang +Date: Wed, 24 Jan 2024 23:59:16 +0800 +Subject: [PATCH] fix a copy-paste --help description of --whatconflicts + +--- + lib/poptQV.c | 2 +- + po/zh_CN.po | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/poptQV.c b/lib/poptQV.c +index f752d8b..73d38b4 100644 +--- a/lib/poptQV.c ++++ b/lib/poptQV.c +@@ -106,7 +106,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, +diff --git a/po/zh_CN.po b/po/zh_CN.po +index bf8cb53..7bfceb0 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -2505,6 +2505,10 @@ msgstr "查找由软件包所触发的软件包" + msgid "rpm verify mode" + msgstr "rpm 校验模式" + ++#: lib/poptQV.c:108 lib/poptQV.c:109 ++msgid "query/verify the package(s) which conflict with a dependency" ++msgstr "查询/校验与依赖项冲突的软件包" ++ + #: lib/poptQV.c:105 lib/poptQV.c:107 + msgid "query/verify the package(s) which require a dependency" + msgstr "查找/校验需要某个依赖对象的软件包" +-- +2.31.1 + diff --git a/rpm.spec b/rpm.spec index 2196c24365a71c88f17598b908a5b89276c882ac..74e296106590e606e5c36b3b3f04b4af4b1d213b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.4 +%define anolis_release .0.5 %define _legacy_common_support 1 # build against xz? @@ -163,6 +163,8 @@ Patch2001: 0001-debugedit-add-loongarch-support.patch # bugfix for anolis Patch3001: 3001-avoid-dead-loop-in-db3_dbiOpen-when-db_create-failed.patch +Patch3002: 0001-fix-a-copy-paste-help-description-of-whatconflicts.patch + # defined as source file to seperate with other patches Source1000: 0001-support-sqlite-backend-rpmdb.patch @@ -733,6 +735,10 @@ rpm -q rpm 2>&1 | grep bdb && rpmdb --rebuilddb %doc doc/librpm/html/* %changelog +* Wed Jan 24 2024 Kaiqiang Wang - 4.14.4-26.0.5 +- Fix a copy-paste --help description of --whatconflicts +- https://bugzilla.openanolis.cn/show_bug.cgi?id=8035 + * Thu Sep 07 2023 Chunmei Xu - 4.14.4-26.0.4 - avoid dead loop in db3_dbiOpen when db_create failed - do not switch rpmdb to sqlite