diff --git a/.gitignore b/.gitignore index 959d302..35c1ef4 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ nasm-2.08.01-xdoc.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 diff --git a/0001-Remove-invalid-pure_func-qualifiers.patch b/0001-Remove-invalid-pure_func-qualifiers.patch new file mode 100644 index 0000000..87ec601 --- /dev/null +++ b/0001-Remove-invalid-pure_func-qualifiers.patch @@ -0,0 +1,27 @@ +From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 8 Feb 2018 14:47:08 +0100 +Subject: [PATCH] Remove invalid pure_func qualifiers + +--- + include/nasmlib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/nasmlib.h b/include/nasmlib.h +index 79e866b..c93cef0 100644 +--- a/include/nasmlib.h ++++ b/include/nasmlib.h +@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); + * seg_init: Initialise the segment-number allocator. + * seg_alloc: allocate a hitherto unused segment number. + */ +-void pure_func seg_init(void); +-int32_t pure_func seg_alloc(void); ++void seg_init(void); ++int32_t seg_alloc(void); + + /* + * many output formats will be able to make use of this: a standard +-- +2.14.3 + diff --git a/nasm.spec b/nasm.spec index 38c62d3..1db1399 100644 --- a/nasm.spec +++ b/nasm.spec @@ -7,13 +7,16 @@ Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm -Version: 2.13.02 -Release: 3%{?dist} +Version: 2.13.03 +Release: 1%{?dist} License: BSD URL: http://www.nasm.us Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2 Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2 +# Submitted upstream: https://bugzilla.nasm.us/show_bug.cgi?id=3392461 +Patch1: 0001-Remove-invalid-pure_func-qualifiers.patch + BuildRequires: perl(Env) BuildRequires: autoconf BuildRequires: asciidoc @@ -59,6 +62,8 @@ include linker, library manager, loader, and information dump. tar xjf %{SOURCE1} --strip-components 1 +%patch1 -p1 + %build autoreconf %configure @@ -98,6 +103,9 @@ make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf %{_mandir}/man1/ld* %changelog +* Thu Feb 08 2018 Michael Simacek - 2.13.03-1 +- Update to upstream version 2.13.03 + * Thu Feb 08 2018 Fedora Release Engineering - 2.13.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ebd7af5..b550c8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nasm-2.13.02.tar.bz2) = 96b8d66fa15a1a6a78fc4ce88029fb406d9904d1e1b65d42b07914c3128d4dc84b4c986a866204a6f25448b0a5eeaa1d0e1147459769765343ddb6ad73edcc0e -SHA512 (nasm-2.13.02-xdoc.tar.bz2) = 696523f1bdfa9091a80e247dd448bb42392d07dca1cb4f7c9f75cd4f68d81c811034e03b9245fe5cbde1a9947bb3deed0476a9ea4abad87ebad6b0133917ee7a +SHA512 (nasm-2.13.03.tar.bz2) = d7a6b4cee8dfd603d8d4c976e5287b5cc542fa0b466ff989b743276a6e28114e64289bf02a7819eca63142a5278aa6eed57773007e5f589e15768e6456a8919d +SHA512 (nasm-2.13.03-xdoc.tar.bz2) = 8bcbff987a18c0649c8f49466c3eeb8fd2beabb6309a3a39a4ef172874771253b7aecb3a1f375ffde8b7ae3522f67ee478ee07f88dc58421fd6b7f0f912fb645