.gitignore

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

.nasm.metadata

@@ -1,2 +1,2 @@
-d0175b1dfbc6b41db273c8b2aac09ce891049caa SOURCES/nasm-2.16.01-xdoc.tar.xz
+1385a796a44e4f374710f6db53a8c647b2041bb0 SOURCES/nasm-2.15.03-xdoc.tar.xz
-3ab515b4a7d50b7f8c63406a19070a93dcfdb820 SOURCES/nasm-2.16.01.tar.xz
+7cb89bb12f80eb016038da9716e814987ef57d00 SOURCES/nasm-2.15.03.tar.xz

SOURCES/nasm-SourceSans-font-name.patch

@@ -0,0 +1,34 @@
+diff -ru ../nasm-2.15.03.ORIG/doc/psfonts.ph ./doc/psfonts.ph
+--- ../nasm-2.15.03.ORIG/doc/psfonts.ph	2020-07-17 20:04:07.000000000 -0500
++++ ./doc/psfonts.ph	2020-12-18 13:45:50.177731896 -0600
+@@ -4,22 +4,22 @@
+ #
+ 
+ # Font substitution lists, in order of preference
+-my @TText = ('SourceSansPro-Bold', 'ClearSans-Bold', 'LiberationSans-Bold',
++my @TText = ('SourceSansPro-Bold', 'SourceSans3-Bold', 'ClearSans-Bold', 'LiberationSans-Bold',
+ 	     'Arial-Bold', 'Helvetica-Bold');
+-my @TItal = ('SourceSansPro-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic',
++my @TItal = ('SourceSansPro-BoldIt', 'SourceSans3-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic',
+ 	     'Arial-BoldItalic', 'Helvetica-BoldItalic');
+ my @TCode = ('SourceCodePro-Bold', 'LiberationMono-Bold', 'Courier-Bold');
+-my @HText = ('SourceSansPro-Semibold', 'ClearSans-Bold', 'Arial-Bold', 'Helvetica-Bold');
+-my @HItal = ('SourceSansPro-SemiboldIt', 'ClearSans-BoldItalic',
++my @HText = ('SourceSansPro-Semibold', 'SourceSans3-Semibold', 'ClearSans-Bold', 'Arial-Bold', 'Helvetica-Bold');
++my @HItal = ('SourceSansPro-SemiboldIt', 'SourceSans3-SemiboldIt', 'ClearSans-BoldItalic',
+ 	     'Arial-BoldItalic', 'Helvetica-BoldItalic');
+ my @HCode = ('SourceCodePro-Semibold', 'LiberationMono-Bold', 'Courier-Bold');
+-my @BText = ('SourceSansPro-Regular', 'ClearSans', 'LiberationSans', 'Arial', 'Helvetica');
+-my @BItal = ('SourceSansPro-It', 'ClearSans-Italic', 'LiberationSans-Italic',
++my @BText = ('SourceSansPro-Regular', 'SourceSans3-Regular', 'ClearSans', 'LiberationSans', 'Arial', 'Helvetica');
++my @BItal = ('SourceSansPro-It', 'SourceSans3-It', 'ClearSans-Italic', 'LiberationSans-Italic',
+ 	     'Arial-Italic', 'Helvetica-Italic');
+ my @BCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');
+-my @QText = ('SourceSansPro-It', 'ClearSans-Italic', 'LiberationSans-Italic',
++my @QText = ('SourceSansPro-It', 'SourceSans3-It', 'ClearSans-Italic', 'LiberationSans-Italic',
+ 	     'Arial-Italic', 'Helvetica-Italic');
+-my @QBold = ('SourceSansPro-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic', 'Arial-Bold', 'Helvetica-BoldItalic');
++my @QBold = ('SourceSansPro-BoldIt', 'SourceSans3-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic', 'Arial-Bold', 'Helvetica-BoldItalic');
+ my @QCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');
+ my @XCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');
+ 

SPECS/nasm.spec

@@ -8,12 +8,13 @@
 
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 2.16.01
+Version: 2.15.03
-Release: 9%{?dist}
+Release: 7%{?dist}
-License: BSD-2-Clause
+License: BSD
 URL: http://www.nasm.us
 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
+Patch0: nasm-SourceSans-font-name.patch
 
 BuildRequires: perl(Env)
 BuildRequires: autoconf
@@ -22,7 +23,6 @@ BuildRequires: asciidoc
 BuildRequires: xmlto
 BuildRequires: gcc
 BuildRequires: make
-Obsoletes: nasm-rdoff < 2.16.01-1
 
 %if %{with documentation}
 %package doc
@@ -39,6 +39,9 @@ BuildArch: noarch
 Obsoletes: %{name}-doc < %{version}-%{release}
 %endif
 
+%package rdoff
+Summary: Tools for the RDOFF binary format, sometimes used with NASM
+
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel
 80x86 microprocessor series, using primarily the traditional Intel
@@ -50,6 +53,11 @@ This package contains documentation for the Netwide Assembler (NASM),
 in HTML, PDF, PostScript, and text formats.
 %endif
 
+%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 -p1
 
@@ -65,10 +73,7 @@ make all %{?_smp_mflags}
 %endif
 
 %install
-%make_install
+%make_install install_rdf
-
-%check
-make -C test golden test diff
 
 %files
 %license LICENSE
@@ -83,52 +88,29 @@ make -C test golden test diff
 %doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz doc/nasmdoc.pdf
 %endif
 
-%changelog
+%files rdoff
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.16.01-9
+%{_bindir}/ldrdf
-- Bump release for October 2024 mass rebuild:
+%{_bindir}/rdf2bin
-  Resolves: RHEL-64018
+%{_bindir}/rdf2ihx
-
+%{_bindir}/rdf2com
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.16.01-8
+%{_bindir}/rdfdump
-- Rebuilt for MSVSphere 10
+%{_bindir}/rdflib
-
+%{_bindir}/rdx
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.16.01-8
+%{_bindir}/rdf2ith
-- Bump release for June 2024 mass rebuild
+%{_bindir}/rdf2srec
-
+%{_mandir}/man1/rd*
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-7
+%{_mandir}/man1/ld*
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Wed Sep 20 2023 Nick Clifton  <nickc@redhat.com> - 2.16.01-4
+%changelog
-- Spec File: Migrated to SPDX license.  (#2222114)
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-7
-
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-4
+  Related: rhbz#1991688
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 04 2023 Dominik Mierzejewski <rpm@greysector.net> - 2.16.01-2
-- add Obsoletes for the dropped subpackage
-
-* Wed Jan 04 2023 Dominik Mierzejewski <rpm@greysector.net> - 2.16.01-1
-- update to 2.16.01 (#2155636)
-- drop obsolete patch
-- drop rdoff subpackage (discontinued upstream)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.05-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.05-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Wed Nov 03 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.15.05-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-6
-- update to 2.15.05 (#1851651)
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-- run internal tests in check section
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-5
+* Tue Mar 09 2021 Nick Clifton <nickc@redhat.com> - 2.15.03-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Default to building without documentation for RHEL.  (#1933222)
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild