import nasm-2.15.03-3.el8

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/nasm-2.13.03-xdoc.tar.bz2
-SOURCES/nasm-2.13.03.tar.bz2
+SOURCES/nasm-2.15.03-xdoc.tar.xz
+SOURCES/nasm-2.15.03.tar.xz

.nasm.metadata

@@ -1,2 +1,2 @@
-e9c5b6b615e1fa89bce3c2e864a68c3004a1c589 SOURCES/nasm-2.13.03-xdoc.tar.bz2
-2a3f4682651d7672f4c6f0abc784eedc9f9a859e SOURCES/nasm-2.13.03.tar.bz2
+1385a796a44e4f374710f6db53a8c647b2041bb0 SOURCES/nasm-2.15.03-xdoc.tar.xz
+7cb89bb12f80eb016038da9716e814987ef57d00 SOURCES/nasm-2.15.03.tar.xz

SOURCES/0001-Remove-invalid-pure_func-qualifiers.patch

@@ -1,27 +0,0 @@
-From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 8 Feb 2018 14:47:08 +0100
-Subject: [PATCH] Remove invalid pure_func qualifiers
-
----
- include/nasmlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 79e866b..c93cef0 100644
---- a/include/nasmlib.h
-+++ b/include/nasmlib.h
-@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn);
-  * seg_init: Initialise the segment-number allocator.
-  * seg_alloc: allocate a hitherto unused segment number.
-  */
--void pure_func seg_init(void);
--int32_t pure_func seg_alloc(void);
-+void seg_init(void);
-+int32_t seg_alloc(void);
- 
- /*
-  * many output formats will be able to make use of this: a standard
--- 
-2.14.3
-

SPECS/nasm.spec

@@ -8,18 +8,16 @@
 
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 2.13.03
-Release: 2%{?dist}
+Version: 2.15.03
+Release: 3%{?dist}
 License: BSD
 URL: http://www.nasm.us
-Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2
-Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
-
-# Submitted upstream: https://bugzilla.nasm.us/show_bug.cgi?id=3392461
-Patch1:  0001-Remove-invalid-pure_func-qualifiers.patch
+Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz
+Source1: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.xz
 
 BuildRequires: perl(Env)
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: asciidoc
 BuildRequires: xmlto
 BuildRequires: gcc
@@ -31,6 +29,7 @@ Summary: Documentation for NASM
 BuildRequires: perl(Font::TTF::Font)
 BuildRequires: perl(Sort::Versions)
 BuildRequires: perl(File::Spec)
+BuildRequires: perl(sort)
 BuildRequires: adobe-source-sans-pro-fonts
 BuildRequires: adobe-source-code-pro-fonts
 BuildRequires: ghostscript
@@ -59,14 +58,11 @@ is sometimes used with the Netwide Assembler (NASM). These tools
 include linker, library manager, loader, and information dump.
 
 %prep
-%setup -q
+%autosetup
 
-tar xjf %{SOURCE1} --strip-components 1
-
-%patch1 -p1
+tar xJf %{SOURCE1} --strip-components 1
 
 %build
-autoreconf
 %configure
 %if %{with documentation}
 make everything %{?_smp_mflags}
@@ -76,10 +72,11 @@ make all %{?_smp_mflags}
 %endif
 
 %install
-make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf
+%make_install install_rdf
 
 %files
-%doc AUTHORS CHANGES README TODO
+%license LICENSE
+%doc AUTHORS CHANGES README.md
 %{_bindir}/nasm
 %{_bindir}/ndisasm
 %{_mandir}/man1/nasm*
@@ -104,7 +101,16 @@ make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf
 %{_mandir}/man1/ld*
 
 %changelog
-* Tue Jul 30 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-2
+* Wed Nov 11 2020 Martin Cermak <mcermak@redhat.com> - 2.15.03-3
+- NVR bump and rebuild for CI gating purposes.
+
+* Fri Oct 30 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-2
+- Remove gatimg.yaml as no gating tests are needed.
+
+* Thu Oct 29 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-1
+- Rebase to 2.15.  (#1889815)
+
+* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-2
 - Suppress documentation building as the required fonts are no longer available.  #1610010
 
 * Thu Feb 08 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-1