Merge remote-tracking branch 'github/nasm-2.16.xx'

Author: H. Peter Anvin

doc/changes.src

@@ -12,7 +12,7 @@ since 2007.
 \b ... here goes release notes not intended to be included in the
 2.16.xx stable series ...
 
-\S{cl-2.16.02} Version 2.16.03
+\S{cl-2.16.03} Version 2.16.03
 
 \e{This is a source build machinery and documentation update
 only. There are no functionality changes.}

nasm.spec.in

@@ -17,8 +17,9 @@ BuildRequires: xmlto
 BuildRequires: perl
 BuildRequires: gcc
 BuildRequires: make
+BuildRequires: xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: nasm-rdoff
+Obsoletes: %{name}-rdoff
 
 %package doc
 Summary: Detailed manual for the Netwide Assembler
@@ -27,8 +28,7 @@ BuildRequires: ghostscript
 BuildRequires: fontconfig
 BuildRequires: adobe-source-sans-pro-fonts
 BuildRequires: adobe-source-code-pro-fonts
-BuildRequires: xz
-Obsoletes: %{nasm}-doc < %{version}-%{release}
+Obsoletes: %{name}-doc < %{version}-%{release}
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel