From 9197b82ca2bd6573f4951f5ec6b435608d25db5d Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Tue, 14 Feb 2023 17:29:36 +0800 Subject: [PATCH] Fix help info error (cherry picked from commit 44e8b74ca9bd276abab4d645e7d77413e2d58426) --- fix-help-info-error.patch | 28 ++++++++++++++++++++++++++++ nasm.spec | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 fix-help-info-error.patch diff --git a/fix-help-info-error.patch b/fix-help-info-error.patch new file mode 100644 index 0000000..fd7d8d7 --- /dev/null +++ b/fix-help-info-error.patch @@ -0,0 +1,28 @@ +From e5987111a8fc89ed86e43ab81e0805d958c61b2c Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Thu, 19 Jan 2023 13:27:29 +0800 +Subject: [PATCH] fix help info error + +Signed-off-by: yangchenguang +--- + asm/nasm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/asm/nasm.c b/asm/nasm.c +index e5ae89a..e00408b 100644 +--- a/asm/nasm.c ++++ b/asm/nasm.c +@@ -2293,8 +2293,8 @@ static void help(FILE *out) + "\n" + " --prefix str prepend the given string to the names of all extern,\n" + " common and global symbols (also --gprefix)\n" +- " --suffix str append the given string to the names of all extern,\n" +- " common and global symbols (also --gprefix)\n" ++ " --postfix str append the given string to the names of all extern,\n" ++ " common and global symbols (also --gpostfix)\n" + " --lprefix str prepend the given string to local symbols\n" + " --lpostfix str append the given string to local symbols\n" + "\n" +-- +2.20.1 + diff --git a/nasm.spec b/nasm.spec index d1b6a9b..de6112e 100644 --- a/nasm.spec +++ b/nasm.spec @@ -8,7 +8,7 @@ Name: nasm Version: 2.15.05 -Release: 3 +Release: 4 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax License: BSD URL: http://www.nasm.us @@ -16,7 +16,7 @@ Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2 Patch6000: enable-make-check.patch - +Patch6001: fix-help-info-error.patch #https://bugzilla.nasm.us/attachment.cgi?id=411648 BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git @@ -89,6 +89,9 @@ make test %{_mandir}/man1/ld* %changelog +* Thu Jan 19 2023 yangchenguang - 2.15.05-4 +- Fix help info error + * Sat Oct 22 2022 zhangruifang - 2.15.05-3 - add version number for Obsoletes - fix bogus date in changelog -- Gitee