From c8bbcf90bd83683d9df8c67d64a99d75054f9853fc2860c7bb05c74c238908ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 8 Sep 2012 11:24:11 +0000 Subject: [PATCH] - Add explicit build dependency on makeinfo OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=15 --- nasm.changes | 5 ++++ nasm.spec | 80 ++++++---------------------------------------------- 2 files changed, 14 insertions(+), 71 deletions(-) diff --git a/nasm.changes b/nasm.changes index ab50234..d26067c 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 8 11:22:45 UTC 2012 - idonmez@suse.com + +- Add explicit build dependency on makeinfo + ------------------------------------------------------------------- Tue Jun 16 17:13:54 CET 2011 - per@computer.org diff --git a/nasm.spec b/nasm.spec index 8c5edae..ac69536 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,7 +1,7 @@ # -# spec file for package nasm (Version 2.09.07) +# spec file for package nasm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: nasm Url: http://nasm.sourceforge.net/ -License: BSD 2-clause -Group: Development/Languages/Other -AutoReqProv: on Version: 2.09.08 -Release: 8 +Release: 0 Summary: Netwide Assembler (An x86 Assembler) +License: BSD-2-Clause +Group: Development/Languages/Other Source: nasm-%version.tar.bz2 +BuildRequires: makeinfo BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,77 +33,19 @@ output several binary formats, including ELF, a.out, Win32, and OS/2. Read the licence agreement in /usr/share/doc/packages/nasm/Licence. - - -Authors: --------- - Julian Hall - Simon Tatham - Nelson Rush - Frank Kotler - Stephen Silver - John Coffman - Yuri Zaporogets - H. Peter Anvin - John Fine - Kendall Bennet - Gary Clark - Andrew Crabtree - Rafael R. Sevilla - Jaime Tejedor GXmez, aka Metalbrain - James Seter - Edward J. Beroset - Stanislav Karchebny, aka berkus, madfire, daemonhunter - Debbie Wiles, aka debs - Trevor Woerner - Michael K. Ter Louw - Martin Wawro - Alexei Frounze - Keith Kanios, aka SpooK - Chuck Crayne - %prep %setup -q %package doc -License: LGPLv2.1+ -Group: Development/Languages/Other Summary: Documentation for Nasm +License: LGPL-2.1+ +Group: Development/Languages/Other PreReq: %install_info_prereq Provides: nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf %description doc This package contains the documentation for Nasm. - - -Authors: --------- - Julian Hall - Simon Tatham - Nelson Rush - Frank Kotler - Stephen Silver - John Coffman - Yuri Zaporogets - H. Peter Anvin - John Fine - Kendall Bennet - Gary Clark - Andrew Crabtree - Rafael R. Sevilla - Jaime Tejedor GXmez, aka Metalbrain - James Seter - Edward J. Beroset - Stanislav Karchebny, aka berkus, madfire, daemonhunter - Debbie Wiles, aka debs - Trevor Woerner - Michael K. Ter Louw - Martin Wawro - Alexei Frounze - Keith Kanios, aka SpooK - Chuck Crayne - %build touch -r ./ver.c ./ver.c.stamp TS=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -113,6 +53,7 @@ sed -i "s/__DATE__/\"$TS\"/g" ver.c touch -r ./ver.c.stamp ./ver.c %configure make all + cd doc make html info nasmdoc.ps nasmdoc.txt @@ -133,9 +74,6 @@ install -m 644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/nasm/html install -m 644 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir} -%clean -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; - %post doc %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz