[nasm:nasm-2.16.xx] nasm.spec.in: add Obsoletes tags where applicable; fix License tag

nasm-bot for H. Peter Anvin hpa at zytor.com
Thu Apr 18 14:06:06 PDT 2024


Commit-ID:  0346e58b6e47c5ed7c6834e3206857c89f59734b
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=0346e58b6e47c5ed7c6834e3206857c89f59734b
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Thu, 18 Apr 2024 14:01:40 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Thu, 18 Apr 2024 14:01:40 -0700

nasm.spec.in: add Obsoletes tags where applicable; fix License tag

Add Obsoletes tags: nasm-rdoff; old nasm-doc.

Add a few BuildRequires: tags.

Update License: tag to match SPDX.

Signed-off-by: H. Peter Anvin (Intel) <hpa at zytor.com>


---
 nasm.spec.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nasm.spec.in b/nasm.spec.in
index 2af48baf..4bb2e5c6 100644
--- a/nasm.spec.in
+++ b/nasm.spec.in
@@ -4,7 +4,7 @@ Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 Name: nasm
 Version: @@NASM_MANGLED_VER@@
 Release: 0%{?dist}
-License: BSD
+License: BSD-2-Clause
 Source: http://www.nasm.us/pub/nasm/releasebuilds/%{nasm_version}/nasm-%{nasm_version}.tar.xz
 URL: http://www.nasm.us/
 BuildRoot: /tmp/rpm-build-nasm
@@ -14,9 +14,11 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: asciidoc
 BuildRequires: xmlto
-BuildRequires: xz
 BuildRequires: perl
+BuildRequires: gcc
+BuildRequires: make
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes: nasm-rdoff
 
 %package doc
 Summary: Detailed manual for the Netwide Assembler
@@ -25,6 +27,8 @@ BuildRequires: ghostscript
 BuildRequires: fontconfig
 BuildRequires: adobe-source-sans-pro-fonts
 BuildRequires: adobe-source-code-pro-fonts
+BuildRequires: xz
+Obsoletes: %{nasm}-doc < %{version}-%{release}
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel


More information about the Nasm-commits mailing list