From b8b77e44524079ef8b365687a5211b0d9e51b359 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sun, 23 Apr 2017 21:15:05 -0700 Subject: [PATCH] nasm.spec: more cleanups, doc is noarch The doc file is noarch, and do some other cleanups. Signed-off-by: H. Peter Anvin --- nasm.spec.in | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/nasm.spec.in b/nasm.spec.in index 1d1e6d7d..2f724f91 100644 --- a/nasm.spec.in +++ b/nasm.spec.in @@ -5,7 +5,6 @@ Name: nasm Version: @@NASM_MANGLED_VER@@ Release: 0%{?dist} License: BSD -Group: Development/Languages 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,20 +13,19 @@ Prefix: %{_prefix} BuildRequires: autoconf BuildRequires: asciidoc BuildRequires: xmlto -BuildRequires: ghostscript -BuildRequires: fontconfig -BuildRequires: adobe-source-sans-pro-fonts -BuildRequires: adobe-source-code-pro-fonts BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package doc -Summary: Extensive documentation for NASM -Group: Development/Languages +Summary: Detailed manual for the Netwide Assembler +BuildArch: noarch +BuildRequires: ghostscript +BuildRequires: fontconfig +BuildRequires: adobe-source-sans-pro-fonts +BuildRequires: adobe-source-code-pro-fonts %package rdoff Summary: Tools for the RDOFF binary format, sometimes used with NASM. -Group: Development/Tools %description NASM is the Netwide Assembler, a free portable assembler for the Intel @@ -53,10 +51,10 @@ make %{?_smp_mflags} everything xz -9ef doc/nasmdoc.pdf %install -rm -rf "$RPM_BUILD_ROOT" -mkdir -p "$RPM_BUILD_ROOT"/%{_bindir} -mkdir -p "$RPM_BUILD_ROOT"/%{_mandir}/man1 -make INSTALLROOT="$RPM_BUILD_ROOT" install install_rdf +rm -rf "%{buildroot}" +mkdir -p "%{buildroot}"/%{_bindir} +mkdir -p "%{buildroot}"/%{_mandir}/man1 +make INSTALLROOT="%{buildroot}" install install_rdf %files %doc AUTHORS CHANGES README TODO