Update to upstream version 2.12.01

.gitignore

@@ -42,3 +42,5 @@ nasm-2.08.01-xdoc.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-fix-ppc64-build.patch

@@ -1,42 +0,0 @@
-From: Michel Normand <normand@linux.vnet.ibm.com>
-Subject: nasm change unused
-Date: Wed, 02 Mar 2016 12:38:37 +0100
-
-nasm change _unused to xunused to avoid conflict
-when building on PowerPC
-
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- compiler.h        |    4 ++--
- output/outmacho.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: nasm-2.12/compiler.h
-===================================================================
---- nasm-2.12.orig/compiler.h
-+++ nasm-2.12/compiler.h
-@@ -82,9 +82,9 @@
- #endif
- 
- #ifdef __GNUC__
--# define _unused	__attribute__((unused))
-+# define xunused	__attribute__((unused))
- #else
--# define _unused
-+# define xunused
- #endif
- 
- /* Some versions of MSVC have these only with underscores in front */
-Index: nasm-2.12/output/outmacho.c
-===================================================================
---- nasm-2.12.orig/output/outmacho.c
-+++ nasm-2.12/output/outmacho.c
-@@ -301,7 +301,7 @@ static uint64_t rel_padcnt = 0;
-     ALIGN(x, fmt.ptrsize)	/* align x to output format width */
- 
- static void debug_reloc (struct reloc *);
--static void debug_section_relocs (struct section *) _unused;
-+static void debug_section_relocs (struct section *) xunused;
- 
- static struct section *get_section_by_name(const char *segname,
-                                            const char *sectname)

nasm.spec

@@ -1,13 +1,11 @@
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 2.12
-Release: 2%{?dist}
+Version: 2.12.01
+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
-# Forwarded upstream: http://bugzilla.nasm.us/show_bug.cgi?id=3392339
-Patch0: %{name}-fix-ppc64-build.patch
 BuildRequires: perl(Env)
 BuildRequires: autoconf
 BuildRequires: asciidoc
@@ -41,7 +39,6 @@ include linker, library manager, loader, and information dump.
 
 %prep
 %setup -q
-%patch0 -p1
 tar xjf %{SOURCE1} --strip-components 1
 
 %build
@@ -92,6 +89,9 @@ fi
 %{_mandir}/man1/ld*
 
 %changelog
+* Tue Mar 22 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.01-1
+- Update to upstream version 2.12.01
+
 * Thu Mar  3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12-2
 - Fix build failure on ppc64
 

sources

@@ -1,2 +1,2 @@
-ff2a1d31444049ccdc1deeec1d868585  nasm-2.12.tar.bz2
-88b21dbe6287183cccdba7de6babe7a7  nasm-2.12-xdoc.tar.bz2
+b2ab4192c2e7e3b4b01e343414b47b48  nasm-2.12.01.tar.bz2
+dbcffcfc629c20e1686ebd790a8c5391  nasm-2.12.01-xdoc.tar.bz2