Skip to content

Commit 0346e58

Browse files
author
H. Peter Anvin
committed
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) <[email protected]>
1 parent cd37b81 commit 0346e58

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

nasm.spec.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
44
Name: nasm
55
Version: @@NASM_MANGLED_VER@@
66
Release: 0%{?dist}
7-
License: BSD
7+
License: BSD-2-Clause
88
Source: http://www.nasm.us/pub/nasm/releasebuilds/%{nasm_version}/nasm-%{nasm_version}.tar.xz
99
URL: http://www.nasm.us/
1010
BuildRoot: /tmp/rpm-build-nasm
@@ -14,9 +14,11 @@ BuildRequires: autoconf
1414
BuildRequires: automake
1515
BuildRequires: asciidoc
1616
BuildRequires: xmlto
17-
BuildRequires: xz
1817
BuildRequires: perl
18+
BuildRequires: gcc
19+
BuildRequires: make
1920
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
21+
Obsoletes: nasm-rdoff
2022

2123
%package doc
2224
Summary: Detailed manual for the Netwide Assembler
@@ -25,6 +27,8 @@ BuildRequires: ghostscript
2527
BuildRequires: fontconfig
2628
BuildRequires: adobe-source-sans-pro-fonts
2729
BuildRequires: adobe-source-code-pro-fonts
30+
BuildRequires: xz
31+
Obsoletes: %{nasm}-doc < %{version}-%{release}
2832

2933
%description
3034
NASM is the Netwide Assembler, a free portable assembler for the Intel

0 commit comments

Comments
 (0)