From 423ffebe6cc4c35835b70af0d2f2c7d190c7f2ec Mon Sep 17 00:00:00 2001 From: caofei Date: Mon, 17 Jul 2023 16:51:39 +0800 Subject: [PATCH] version: this is now the 2.17 development branch Reference: https://github.com/netwide-assembler/nasm/commit/feac856c Signed-off-by: caofei --- ...s-is-now-the-2.17-development-branch.patch | 40 +++++++++++++++++++ nasm.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-version-this-is-now-the-2.17-development-branch.patch diff --git a/0001-version-this-is-now-the-2.17-development-branch.patch b/0001-version-this-is-now-the-2.17-development-branch.patch new file mode 100644 index 0000000..c01b929 --- /dev/null +++ b/0001-version-this-is-now-the-2.17-development-branch.patch @@ -0,0 +1,40 @@ +From feac856c543ba6e89cfe3e01377edbf942003da0 Mon Sep 17 00:00:00 2001 +From: "H. Peter Anvin" +Date: Tue, 20 Dec 2022 21:55:08 -0800 +Subject: [PATCH] version: this is now the 2.17 development branch + +2.16 has been released, this is now officially the 2.17 development +branch. + +Signed-off-by: H. Peter Anvin +--- + doc/changes.src | 5 +++++ + version | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/doc/changes.src b/doc/changes.src +index a961fbe7..751e2aaa 100644 +--- a/doc/changes.src ++++ b/doc/changes.src +@@ -7,6 +7,11 @@ + The NASM 2 series supports x86-64, and is the production version of NASM + since 2007. + ++\S{cl-2.17} Version 2.17 ++ ++\b ... here goes release notes not intended to be included in the ++2.16.xx stable series ... ++ + \S{cl-2.16} Version 2.16 + + \b Support for the \c{rdf} format has been discontinued and all the +diff --git a/version b/version +index 6d28a11d..51202b71 100644 +--- a/version ++++ b/version +@@ -1 +1 @@ +-2.16 ++2.17rc0 +-- +2.33.0 + diff --git a/nasm.spec b/nasm.spec index b4ea0d2..ed2ef0e 100644 --- a/nasm.spec +++ b/nasm.spec @@ -8,7 +8,7 @@ Name: nasm Version: 2.16.01 -Release: 1 +Release: 2 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax License: BSD-2-Clause URL: http://www.nasm.us @@ -17,6 +17,7 @@ Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version Patch6000: enable-make-check.patch Patch6001: fix-help-info-error.patch +Patch6002: 0001-version-this-is-now-the-2.17-development-branch.patch BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git automake Obsoletes: nasm-rdoff < 2.16.01-1 @@ -77,6 +78,9 @@ make test %{_mandir}/man1/ndisasm* %changelog +* Mon Jul 17 2023 caofei - 2.16.01-2 +- version: this is now the 2.17 development branch + * Thu May 18 2023 liyanan - 2.16.01-1 - update to 2.16.01 -- Gitee