From d26e1f89a9eb61419508d7954aa2e1273d4f14b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com>
Date: Sun, 2 Jun 2024 13:31:59 +0300
Subject: [PATCH] [nasm] Update to 2.16.03. Fixes JB#62176

Cleanup spec.
---
 nasm          |  2 +-
 rpm/nasm.spec | 27 ++-------------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/nasm b/nasm
index 214f2d4..cd37b81 160000
--- a/nasm
+++ b/nasm
@@ -1 +1 @@
-Subproject commit 214f2d4c56925a280c480950bbf71389e2169e1a
+Subproject commit cd37b81b320ead83ca5a6bbce5da0a6456663bc6
diff --git a/rpm/nasm.spec b/rpm/nasm.spec
index 6651176..12faa58 100644
--- a/rpm/nasm.spec
+++ b/rpm/nasm.spec
@@ -2,29 +2,19 @@
 # -*- coding: utf-8 -*-
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 2.15.05
+Version: 2.16.03
 Release: 1
 License: BSD
 URL: http://www.nasm.us
 Source0: %{name}-%{version}.tar.xz
 Source1: nasm.sh
 BuildRequires: perl
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel
 80x86 microprocessor series, using primarily the traditional Intel
 instruction mnemonics and syntax.
 
-%package rdoff
-Summary: Tools for the RDOFF binary format, sometimes used with NASM
-
-%description rdoff
-Tools for the operating-system independent RDOFF binary format, which
-is sometimes used with the Netwide Assembler (NASM). These tools
-include linker, library manager, loader, and information dump.
-
 %prep
 %autosetup -n %{name}-%{version}/%{name}
 
@@ -36,26 +26,13 @@ include linker, library manager, loader, and information dump.
 %install
 # Dummy manpages so install doesn't fail
 touch nasm.1 ndisasm.1
-make DESTDIR=%{buildroot} install install_rdf
+%make_install
 install -D -t %{buildroot}%{_sysconfdir}/profile.d %{SOURCE1}
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS CHANGES README.md
 %license LICENSE
 %{_bindir}/nasm
 %{_bindir}/ndisasm
 %{_sysconfdir}/profile.d/nasm.sh
 %exclude %{_datadir}/man
-
-%files rdoff
-%defattr(-,root,root)
-%{_bindir}/ldrdf
-%{_bindir}/rdf2bin
-%{_bindir}/rdf2ihx
-%{_bindir}/rdf2com
-%{_bindir}/rdfdump
-%{_bindir}/rdflib
-%{_bindir}/rdx
-%{_bindir}/rdf2ith
-%{_bindir}/rdf2srec