From be15b7b4a66b0f0928b5ccac128c1022043e9c91 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 9 Mar 2021 17:47:13 +0000 Subject: [PATCH 1/3] Default to building nasm without documentation for RHEL --- nasm.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nasm.spec b/nasm.spec index de4f304..d4b1189 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,9 +1,15 @@ +%if 0%{?rhel} > 0 +# On RHEL we default to building WITHOUT documentation. +%bcond_with documentation +%else +# 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: 4%{?dist} +Release: 5%{?dist} License: BSD URL: http://www.nasm.us Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz @@ -96,6 +102,9 @@ make all %{?_smp_mflags} %{_mandir}/man1/ld* %changelog +* Tue Mar 09 2021 Nick Clifton - 2.15.03-5 +- Default to building without documentation for RHEL. (#1933222) + * Tue Jan 26 2021 Fedora Release Engineering - 2.15.03-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e0308664238ed294d9f13f52cbb44df1453e31e3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 3 Nov 2021 09:12:22 +0100 Subject: [PATCH 2/3] update to 2.15.05 (#1851651) --- .gitignore | 2 ++ nasm.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 30f9477..92bb522 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ nasm-2.08.01-xdoc.tar.bz2 /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 diff --git a/nasm.spec b/nasm.spec index d4b1189..389a1ff 100644 --- a/nasm.spec +++ b/nasm.spec @@ -8,8 +8,8 @@ Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm -Version: 2.15.03 -Release: 5%{?dist} +Version: 2.15.05 +Release: 1%{?dist} License: BSD URL: http://www.nasm.us Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz @@ -102,6 +102,9 @@ make all %{?_smp_mflags} %{_mandir}/man1/ld* %changelog +* Wed Nov 03 2021 Dominik Mierzejewski - 2.15.05-1 +- update to 2.15.05 (#1851651) + * Tue Mar 09 2021 Nick Clifton - 2.15.03-5 - Default to building without documentation for RHEL. (#1933222) diff --git a/sources b/sources index ea231df..08208d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nasm-2.15.03-xdoc.tar.xz) = ebd1806ade7a64c7527a0c0d435bdda41f1386305ba08b2931206faccc9b43a679c195c0d60364f6b36a8684cc944e1a185fd01c9aa129971cdcc9042ae44f5b -SHA512 (nasm-2.15.03.tar.xz) = be98e8e0a3b5f5296bc941a7bbcbf44c4084c65d11aed60d17a803b9647d59bd14ec06e780ac22c4bbe8869625eb8e6139d18a88e25310edfce0fe0fc0172950 +SHA512 (nasm-2.15.05-xdoc.tar.xz) = 1a7b27b14834e1b0c3d656fe5ab0f69c0773fb86e8ef5367fd2869e266d5e3441aed0b11e1c19c97c14413d25f3e6e7b3c012a356692af3ce40db2ee1f36b2ce +SHA512 (nasm-2.15.05.tar.xz) = 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7 From 7bb4ff8339369e32e237d729278f8cb4a3b0fa2a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 3 Nov 2021 09:14:39 +0100 Subject: [PATCH 3/3] run internal tests in check section --- nasm.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nasm.spec b/nasm.spec index 389a1ff..f72171d 100644 --- a/nasm.spec +++ b/nasm.spec @@ -75,6 +75,9 @@ make all %{?_smp_mflags} %install %make_install install_rdf +%check +make -C test golden test diff + %files %license LICENSE %doc AUTHORS CHANGES README.md @@ -104,6 +107,7 @@ make all %{?_smp_mflags} %changelog * Wed Nov 03 2021 Dominik Mierzejewski - 2.15.05-1 - update to 2.15.05 (#1851651) +- run internal tests in check section * Tue Mar 09 2021 Nick Clifton - 2.15.03-5 - Default to building without documentation for RHEL. (#1933222)