aboutsummaryrefslogtreecommitdiffstats
path: root/nasm.spec.in
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2003-08-29 21:03:44 +0000
committerH. Peter Anvin <hpa@zytor.com>2003-08-29 21:03:44 +0000
commite68699287c525fe5e0e30dcb48376e6bfb472158 (patch)
treed237f21d8d8ff143f81d1b50980af9d6fa991022 /nasm.spec.in
parent634a6607ca6265fdd24bed205130424bc863dc4e (diff)
downloadnasm-daily-e68699287c525fe5e0e30dcb48376e6bfb472158.tar.gz
nasm-daily-e68699287c525fe5e0e30dcb48376e6bfb472158.tar.xz
nasm-daily-e68699287c525fe5e0e30dcb48376e6bfb472158.zip
Update for newer RH releasesnasm-0.98.37
Diffstat (limited to 'nasm.spec.in')
-rw-r--r--nasm.spec.in32
1 files changed, 14 insertions, 18 deletions
diff --git a/nasm.spec.in b/nasm.spec.in
index 2fc2a873..b7b66635 100644
--- a/nasm.spec.in
+++ b/nasm.spec.in
@@ -1,3 +1,4 @@
+# $Id$
Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
Name: nasm
Version: @@VERSION@@
@@ -10,9 +11,6 @@ URL: http://nasm.sourceforge.net/
BuildRoot: /tmp/rpm-build-nasm
Prefix: /usr
BuildPrereq: perl
-BuildArchitectures: %{_target_cpu} noarch
-# This is necessary on newer RPM due to the arch/noarch issue
-%define _unpackaged_files_terminate_build 0
%package doc
Summary: Extensive documentation for NASM
@@ -49,13 +47,16 @@ rm -rf "$RPM_BUILD_ROOT"
mkdir -p "$RPM_BUILD_ROOT"
mkdir -p "$RPM_BUILD_ROOT"/usr/bin
mkdir -p "$RPM_BUILD_ROOT"/usr/man/man1
-mkdir -p "$RPM_BUILD_ROOT"/usr/info
+mkdir -p "$RPM_BUILD_ROOT"/%{_infodir}
DOC="$RPM_BUILD_ROOT"/usr/doc/nasm-%{version}
mkdir -p "$DOC"
mkdir -p "$DOC"/rdoff
rm -f "$RPM_BUILD_ROOT"/usr/info/nasm.*
-make INSTALLROOT="$RPM_BUILD_ROOT" docdir=/usr/doc/nasm-%{version} install_everything
-gzip -9 "$RPM_BUILD_ROOT"/usr/info/nasm.*
+make INSTALLROOT="$RPM_BUILD_ROOT" \
+ docdir=/usr/doc/nasm-%{version} \
+ infodir=%{_infodir} \
+ install_everything
+gzip -9 "$RPM_BUILD_ROOT"/%{_infodir}/nasm.*
gzip -9 "$DOC"/*.txt "$DOC"/*.ps
cp AUTHORS CHANGES COPYING README TODO doc/*.doc "$DOC"
cp rdoff/README "$DOC"/rdoff
@@ -65,34 +66,29 @@ cp rdoff/doc/* "$DOC"/rdoff
rm -rf "$RPM_BUILD_ROOT"
%post doc
-/sbin/install-info "$RPM_INSTALL_PREFIX"/info/nasm.info.gz "$RPM_INSTALL_PREFIX"/info/dir
+/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir
%preun doc
if [ $1 = 0 ]; then
- /sbin/install-info --delete "$RPM_INSTALL_PREFIX"/info/nasm.info.gz "$RPM_INSTALL_PREFIX"/info/dir
+ /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir
fi
-%ifarch noarch
-
-%files doc
-%attr(-,root,root) %doc /usr/info/nasm.info*.gz
-%attr(-,root,root) %doc /usr/doc/nasm-%{version}/*
-
-%else
-
%files
%attr(-,root,root) /usr/bin/nasm
%attr(-,root,root) /usr/bin/ndisasm
%attr(-,root,root) %doc /usr/man/man1/nasm.1*
%attr(-,root,root) %doc /usr/man/man1/ndisasm.1*
+%files doc
+%attr(-,root,root) %doc %{_infodir}/nasm.info*.gz
+%attr(-,root,root) %doc /usr/doc/nasm-%{version}/*
+
%files rdoff
%attr(-,root,root) /usr/bin/ldrdf
%attr(-,root,root) /usr/bin/rdf2bin
%attr(-,root,root) /usr/bin/rdf2com
+%attr(-,root,root) /usr/bin/rdf2ihx
%attr(-,root,root) /usr/bin/rdfdump
%attr(-,root,root) /usr/bin/rdflib
%attr(-,root,root) /usr/bin/rdx
%attr(-,root,root) %doc /usr/doc/nasm-%{version}/rdoff/*
-
-%endif