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

This commit is contained in:
H. Peter Anvin 2024-04-18 15:32:59 -07:00
commit 3334c3c2dc
2 changed files with 4 additions and 4 deletions

View File

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

View File

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