diff --git a/.gitignore b/.gitignore index 35c1ef4..a6c6cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ nasm-2.08.01-xdoc.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 diff --git a/0001-Remove-invalid-pure_func-qualifiers.patch b/0001-Remove-invalid-pure_func-qualifiers.patch deleted file mode 100644 index 87ec601..0000000 --- a/0001-Remove-invalid-pure_func-qualifiers.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 fd1a847..1d05220 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,21 +1,13 @@ -# Build without documentation per default if built as part of a module. -%if 0%{?_module_build} -%bcond_with documentation -%else %bcond_without documentation -%endif Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm -Version: 2.13.03 -Release: 3%{?dist} +Version: 2.14.02 +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 +Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2 +Source1: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2 BuildRequires: perl(Env) BuildRequires: autoconf @@ -62,8 +54,6 @@ include linker, library manager, loader, and information dump. tar xjf %{SOURCE1} --strip-components 1 -%patch1 -p1 - %build autoreconf %configure @@ -75,7 +65,7 @@ make all %{?_smp_mflags} %endif %install -make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf +%make_install install_rdf %files %doc AUTHORS CHANGES README TODO @@ -103,6 +93,9 @@ make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf %{_mandir}/man1/ld* %changelog +* Wed Apr 10 2019 Igor Gnatenko - 2.14.02-1 +- Update to 2.14.02 + * Fri Feb 01 2019 Fedora Release Engineering - 2.13.03-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b550c8a..51179d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nasm-2.13.03.tar.bz2) = d7a6b4cee8dfd603d8d4c976e5287b5cc542fa0b466ff989b743276a6e28114e64289bf02a7819eca63142a5278aa6eed57773007e5f589e15768e6456a8919d -SHA512 (nasm-2.13.03-xdoc.tar.bz2) = 8bcbff987a18c0649c8f49466c3eeb8fd2beabb6309a3a39a4ef172874771253b7aecb3a1f375ffde8b7ae3522f67ee478ee07f88dc58421fd6b7f0f912fb645 +SHA512 (nasm-2.14.02.tar.xz) = c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81 +SHA512 (nasm-2.14.02-xdoc.tar.xz) = b62bbb8bcd0451642d57a9544598ab76c55da0480b61c06c2736c6e566f3d2c0f5a28ec784e4c0a932950020bd08d7829a73f6bc11dc7b48b60484ab46910562