diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..6d4be4845893b77d1844252c3d0e074fea94039b --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/nasm diff --git a/enable-make-check.patch b/enable-make-check.patch index 224d2998a9a6aff5a9de5438bd260493287f8d6f..5202833693689eddc3cfe6bf792695cdd06fd945 100644 --- a/enable-make-check.patch +++ b/enable-make-check.patch @@ -9,22 +9,23 @@ Signed-off-by: ExtinctFire 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5725ed3..9282215 100644 +index fcf33ab..f4bab73 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -459,10 +459,10 @@ - splint -weak *.c - +@@ -564,11 +564,11 @@ splint: + .PHONY: test test: $(PROGS) -- cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm -+ cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm --verbose + cd $(srcdir)/test && \ +- $(RUNPERL) performtest.pl --nasm=../nasm$(X) *.asm ++ $(RUNPERL) performtest.pl --nasm=../nasm$(X) *.asm --verbose golden: $(PROGS) -- cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm -+ cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm --verbose + cd $(srcdir)/test && \ +- $(RUNPERL) performtest.pl --golden --nasm=../nasm$(X) *.asm ++ $(RUNPERL) performtest.pl --golden --nasm=../nasm$(X) *.asm --verbose - travis: $(PROGS) - $(PYTHON3) travis/nasm-t.py run + # + # Travis tests -- 2.23.0 diff --git a/fix-help-info-error.patch b/fix-help-info-error.patch deleted file mode 100644 index fd7d8d7c948618e5af60f931f0fee5dc46f83f7b..0000000000000000000000000000000000000000 --- a/fix-help-info-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -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-2.16.03-xdoc.tar.xz b/nasm-2.16.03-xdoc.tar.xz deleted file mode 100644 index d98ec82091509a6f275dfb947d3bb0ac0d6224f5..0000000000000000000000000000000000000000 Binary files a/nasm-2.16.03-xdoc.tar.xz and /dev/null differ diff --git a/nasm-2.16.03.tar.xz b/nasm-2.16.03.tar.xz deleted file mode 100644 index e58a79f14d64786ccfe63565692d821b47355043..0000000000000000000000000000000000000000 Binary files a/nasm-2.16.03.tar.xz and /dev/null differ diff --git a/nasm-3.01-xdoc.tar.xz b/nasm-3.01-xdoc.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..afbbe4576c3a02a6c8601f6610417581dd4ccf5b --- /dev/null +++ b/nasm-3.01-xdoc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47762f066c032306cd0723b438ffd9862aad2729225433cc9fcd5e21cf10f114 +size 957556 diff --git a/nasm-3.01.tar.xz b/nasm-3.01.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..96bc3cfe9c66fb8e9b6e4031bcd874cb3f0b0fdf --- /dev/null +++ b/nasm-3.01.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7324cbe86e767b65f26f467ed8b12ad80e124e3ccb89076855c98e43a9eddd4 +size 1499136 diff --git a/nasm.spec b/nasm.spec index 8989cdf54bc7e15747841a8c56061bcab8383e1e..8a6109e4e93658998551a49580c86e6963a82915 100644 --- a/nasm.spec +++ b/nasm.spec @@ -7,7 +7,7 @@ %endif Name: nasm -Version: 2.16.03 +Version: 3.01 Release: 1 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax License: BSD-2-Clause @@ -16,7 +16,6 @@ Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.xz Patch6000: enable-make-check.patch -Patch6001: fix-help-info-error.patch BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git automake Obsoletes: nasm-rdoff < 2.16.01-1 @@ -77,6 +76,9 @@ make test %{_mandir}/man1/ndisasm* %changelog +* Tue Oct 14 2025 Funda Wang - 3.01-1 +- update to 3.01 + * Thu Aug 08 2024 yuanlipeng - 2.16.03-1 - Update package to version 2.16.03