7 changed files with 183 additions and 42 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,64 @@
-SOURCES/nasm-2.15.03-xdoc.tar.xz
-SOURCES/nasm-2.15.03.tar.xz
+nasm-2.08.01.tar.bz2
+nasm-2.08.01-xdoc.tar.bz2
+/nasm-2.08.02.tar.bz2
+/nasm-2.08.02-xdoc.tar.bz2
+/nasm-2.09.tar.bz2
+/nasm-2.09-xdoc.tar.bz2
+/nasm-2.09.01-xdoc.tar.bz2
+/nasm-2.09.01.tar.bz2
+/nasm-2.09.02.tar.bz2
+/nasm-2.09.02-xdoc.tar.bz2
+/nasm-2.09.03.tar.bz2
+/nasm-2.09.03-xdoc.tar.bz2
+/nasm-2.09.04.tar.bz2
+/nasm-2.09.04-xdoc.tar.bz2
+/nasm-2.09.05.tar.bz2
+/nasm-2.09.05-xdoc.tar.bz2
+/nasm-2.09.07.tar.bz2
+/nasm-2.09.07-xdoc.tar.bz2
+/nasm-2.09.08-xdoc.tar.bz2
+/nasm-2.09.08.tar.bz2
+/nasm-2.10.tar.bz2
+/nasm-2.10-xdoc.tar.bz2
+/nasm-2.10.03.tar.bz2
+/nasm-2.10.03-xdoc.tar.bz2
+/nasm-2.10.07.tar.bz2
+/nasm-2.10.07-xdoc.tar.bz2
+/nasm-2.10.09.tar.bz2
+/nasm-2.10.09-xdoc.tar.bz2
+/nasm-2.11.tar.bz2
+/nasm-2.11-xdoc.tar.bz2
+/nasm-2.11.02.tar.bz2
+/nasm-2.11.02-xdoc.tar.bz2
+/nasm-2.11.03.tar.bz2
+/nasm-2.11.03-xdoc.tar.bz2
+/nasm-2.11.04.tar.bz2
+/nasm-2.11.04-xdoc.tar.bz2
+/nasm-2.11.05.tar.bz2
+/nasm-2.11.05-xdoc.tar.bz2
+/nasm-2.11.06.tar.bz2
+/nasm-2.11.06-xdoc.tar.bz2
+/nasm-2.11.08.tar.bz2
+/nasm-2.11.08-xdoc.tar.bz2
+/nasm-2.12.tar.bz2
+/nasm-2.12-xdoc.tar.bz2
+/nasm-2.12.01.tar.bz2
+/nasm-2.12.01-xdoc.tar.bz2
+/nasm-2.12.02.tar.bz2
+/nasm-2.12.02-xdoc.tar.bz2
+/nasm-2.13.tar.bz2
+/nasm-2.13-xdoc.tar.bz2
+/nasm-2.13.01.tar.bz2
+/nasm-2.13.01-xdoc.tar.bz2
+/nasm-2.13.02.tar.bz2
+/nasm-2.13.02-xdoc.tar.bz2
+/nasm-2.13.03.tar.bz2
+/nasm-2.13.03-xdoc.tar.bz2
+/nasm-2.14.02.tar.xz
+/nasm-2.14.02-xdoc.tar.xz
+/nasm-2.15.03-xdoc.tar.xz
+/nasm-2.15.03.tar.xz
+/nasm-2.15.05-xdoc.tar.xz
+/nasm-2.15.05.tar.xz
+/nasm-2.16.01-xdoc.tar.xz
+/nasm-2.16.01.tar.xz
--- a/.nasm.metadata
+++ b/.nasm.metadata
@ -1,2 +0,0 @@
-1385a796a44e4f374710f6db53a8c647b2041bb0 SOURCES/nasm-2.15.03-xdoc.tar.xz
-7cb89bb12f80eb016038da9716e814987ef57d00 SOURCES/nasm-2.15.03.tar.xz
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.imagemode-tmt-x86_64-aarch64.functional}
--- a/SPECS/nasm.spec
+++ b/SPECS/nasm.spec
@ -1,16 +1,16 @@
-# Build without documentation per default if built as part of a module.
-%if 0%{?_module_build}
+%if 0%{?rhel} > 0
+# On RHEL we default to building WITHOUT documentation.
 %bcond_with documentation
 %else
-# XXX adobe fonts no longer supported, so building with documentation is now suppressed.
-%bcond_with documentation
+# Default to building WITH documentation.
+%bcond_without documentation
 %endif

 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 2.15.03
-Release: 3%{?dist}
-License: BSD
+Version: 2.16.01
+Release: 9%{?dist}
+License: BSD-2-Clause
 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
@ -22,6 +22,7 @@ BuildRequires: asciidoc
 BuildRequires: xmlto
 BuildRequires: gcc
 BuildRequires: make
+Obsoletes: nasm-rdoff < 2.16.01-1

 %if %{with documentation}
 %package doc
@ -38,9 +39,6 @@ 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
@ -52,13 +50,8 @@ 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
+%autosetup -p1

 tar xJf %{SOURCE1} --strip-components 1

@ -72,7 +65,10 @@ make all %{?_smp_mflags}
 %endif

 %install
-%make_install install_rdf
+%make_install
+
+%check
+make -C test golden test diff

 %files
 %license LICENSE
@ -87,31 +83,76 @@ make all %{?_smp_mflags}
 %doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz doc/nasmdoc.pdf
 %endif

-%files rdoff
-%{_bindir}/ldrdf
-%{_bindir}/rdf2bin
-%{_bindir}/rdf2ihx
-%{_bindir}/rdf2com
-%{_bindir}/rdfdump
-%{_bindir}/rdflib
-%{_bindir}/rdx
-%{_bindir}/rdf2ith
-%{_bindir}/rdf2srec
-%{_mandir}/man1/rd*
-%{_mandir}/man1/ld*
-
 %changelog
-* Wed Nov 11 2020 Martin Cermak <mcermak@redhat.com> - 2.15.03-3
- NVR bump and rebuild for CI gating purposes.
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.16.01-9
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018

-* Fri Oct 30 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-2
- Remove gatimg.yaml as no gating tests are needed.
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.16.01-8
+- Bump release for June 2024 mass rebuild

-* Thu Oct 29 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-1
- Rebase to 2.15.  (#1889815)
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* 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
+* 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
+- Spec File: Migrated to SPDX license.  (#2222114)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.01-4
+- 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
+- update to 2.15.05 (#1851651)
+- run internal tests in check section
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec 18 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.15.03-3
+- Patch to workaround renamed SourceSans font family
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.15.03-1
+- Update to 2.15.03
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.02-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Apr 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.14.02-1
+- Update to 2.14.02
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.03-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Thu Feb 08 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-1
 - Update to upstream version 2.13.03
--- a/plans/tier0.fmf
+++ b/plans/tier0.fmf
@ -0,0 +1,29 @@
+# Tier 0 test plan. It's actually Tier 1
+#   - limited to its public part
+#   - executed on the architecture at hand
+# When run by osci.tier0 on CentOS Stream or RHEL, it receives the following
+# context:
+#   arch=x86_64 (the architecture at hand, currently OSCI uses just x86_64)
+#   distro=rhel<M>.<m> (even for CentOS Stream builds)
+#   trigger=build
+
+summary: Tier 0 test plan
+discover:
+  - name: collect_info
+    how: shell
+    tests:
+      - name: /info/rpms
+        test: rpm -qa --last
+  - name: public_tests
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/tests/nasm.git
+    filter: tier:1
+execute:
+  how: tmt
+adjust+:
+  - when: distro > rhel-7
+    prepare+:
+      - how: shell
+        script:
+          - dnf config-manager --set-enabled '*CRB*' || true
+          - dnf config-manager --set-enabled crb || true
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (nasm-2.16.01-xdoc.tar.xz) = ec260c0a537b0172e6f2ac17118c744db8743886388a112e99bab1b8c8fee91547dade69dcfe9a15289b2b1a428e8c009048a468f7982b03dd4506abcafc0787
+SHA512 (nasm-2.16.01.tar.xz) = 51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833