Accepting request 133356 from devel:tools:compiler

- Add explicit build dependency on makeinfo

OBS-URL: https://build.opensuse.org/request/show/133356
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nasm?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2012-09-11 07:13:30 +00:00 committed by Git OBS Bridge
commit 7b13d45a13
2 changed files with 12 additions and 69 deletions

View File

@ -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 Tue Jun 16 17:13:54 CET 2011 - per@computer.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package nasm # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,18 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: nasm Name: nasm
Url: http://nasm.sourceforge.net/ Url: http://nasm.sourceforge.net/
Version: 2.09.08
Release: 0
Summary: Netwide Assembler (An x86 Assembler)
License: BSD-2-Clause License: BSD-2-Clause
Group: Development/Languages/Other Group: Development/Languages/Other
AutoReqProv: on
Version: 2.09.08
Release: 1
Summary: Netwide Assembler (An x86 Assembler)
Source: nasm-%version.tar.bz2 Source: nasm-%version.tar.bz2
BuildRequires: makeinfo
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %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. Read the licence agreement in /usr/share/doc/packages/nasm/Licence.
Authors:
--------
Julian Hall <Jules@acris.co.uk>
Simon Tatham <anakin@pobox.com>
Nelson Rush <palisade@users.sourceforge.net>
Frank Kotler <fbkotler@users.sf.net>
Stephen Silver <nasm@argentum.freeserve.co.uk>
John Coffman <johninsd@users.sourceforge.net>
Yuri Zaporogets <yuriz@users.sourceforge.net>
H. Peter Anvin <hpa@zytor.com>
John Fine <johnfine@earthlink.net>
Kendall Bennet <KendallB@scitechsoft.com>
Gary Clark
Andrew Crabtree
Rafael R. Sevilla <dido@pacific.net.ph>
Jaime Tejedor GXmez, aka Metalbrain <metalbrain_coder@gmx.net>
James Seter <pharos@zsnes.com>
Edward J. Beroset <beroset@mindspring.com>
Stanislav Karchebny, aka berkus, madfire, daemonhunter <madfire@users.sourceforge.net>
Debbie Wiles, aka debs <debs@dwiles.demon.co.uk>
Trevor Woerner
Michael K. Ter Louw <mterlo1@uic.edu>
Martin Wawro
Alexei Frounze <alexfru@users.sourceforge.net>
Keith Kanios, aka SpooK <keith@kanios.net>
Chuck Crayne <ccrayne@users.sourceforge.net>
%prep %prep
%setup -q %setup -q
%package doc %package doc
Summary: Documentation for Nasm
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Languages/Other Group: Development/Languages/Other
Summary: Documentation for Nasm
PreReq: %install_info_prereq PreReq: %install_info_prereq
Provides: nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf Provides: nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf
%description doc %description doc
This package contains the documentation for Nasm. This package contains the documentation for Nasm.
Authors:
--------
Julian Hall <Jules@acris.co.uk>
Simon Tatham <anakin@pobox.com>
Nelson Rush <palisade@users.sourceforge.net>
Frank Kotler <fbkotler@users.sf.net>
Stephen Silver <nasm@argentum.freeserve.co.uk>
John Coffman <johninsd@users.sourceforge.net>
Yuri Zaporogets <yuriz@users.sourceforge.net>
H. Peter Anvin <hpa@zytor.com>
John Fine <johnfine@earthlink.net>
Kendall Bennet <KendallB@scitechsoft.com>
Gary Clark
Andrew Crabtree
Rafael R. Sevilla <dido@pacific.net.ph>
Jaime Tejedor GXmez, aka Metalbrain <metalbrain_coder@gmx.net>
James Seter <pharos@zsnes.com>
Edward J. Beroset <beroset@mindspring.com>
Stanislav Karchebny, aka berkus, madfire, daemonhunter <madfire@users.sourceforge.net>
Debbie Wiles, aka debs <debs@dwiles.demon.co.uk>
Trevor Woerner
Michael K. Ter Louw <mterlo1@uic.edu>
Martin Wawro
Alexei Frounze <alexfru@users.sourceforge.net>
Keith Kanios, aka SpooK <keith@kanios.net>
Chuck Crayne <ccrayne@users.sourceforge.net>
%build %build
touch -r ./ver.c ./ver.c.stamp touch -r ./ver.c ./ver.c.stamp
TS=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') 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 touch -r ./ver.c.stamp ./ver.c
%configure %configure
make all make all
cd doc cd doc
make html info nasmdoc.ps nasmdoc.txt 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 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir} 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 %post doc
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz