8 changed files with 174 additions and 18 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,60 @@
-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
--- 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-9
+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/nasm-SourceSans-font-name.patch
+++ b/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');
+ 
--- a/SPECS/nasm.spec
+++ b/SPECS/nasm.spec
@ -1,19 +1,20 @@
-# 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}
+Release: 7%{?dist}
 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
@ -58,7 +59,7 @@ 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

@ -101,17 +102,42 @@ make all %{?_smp_mflags}
 %{_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.
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Fri Oct 30 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-2
- Remove gatimg.yaml as no gating tests are needed.
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* Thu Oct 29 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-1
- Rebase to 2.15.  (#1889815)
+* Tue Mar 09 2021 Nick Clifton <nickc@redhat.com> - 2.15.03-5
+- Default to building without documentation for RHEL.  (#1933222)

-* 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
+* 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.15.03-xdoc.tar.xz) = ebd1806ade7a64c7527a0c0d435bdda41f1386305ba08b2931206faccc9b43a679c195c0d60364f6b36a8684cc944e1a185fd01c9aa129971cdcc9042ae44f5b
+SHA512 (nasm-2.15.03.tar.xz) = be98e8e0a3b5f5296bc941a7bbcbf44c4084c65d11aed60d17a803b9647d59bd14ec06e780ac22c4bbe8869625eb8e6139d18a88e25310edfce0fe0fc0172950