From af67055deccf841e43b7f0e3afc58e449d6c29da Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 May 2017 04:00:18 +0200 Subject: [PATCH] Update to upstream version 2.13 --- .gitignore | 2 ++ nasm.spec | 36 ++++++++++++++---------------------- sources | 4 ++-- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index ce7750d..23ef665 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ nasm-2.08.01-xdoc.tar.bz2 /nasm-2.12.01-xdoc.tar.bz2 /nasm-2.12.02.tar.bz2 /nasm-2.12.02-xdoc.tar.bz2 +/nasm-2.13.tar.bz2 +/nasm-2.13-xdoc.tar.bz2 diff --git a/nasm.spec b/nasm.spec index 6b25965..b04ecab 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,7 +1,7 @@ Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm -Version: 2.12.02 -Release: 2%{?dist} +Version: 2.13 +Release: 1%{?dist} License: BSD URL: http://www.nasm.us Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2 @@ -10,12 +10,16 @@ BuildRequires: perl(Env) BuildRequires: autoconf BuildRequires: asciidoc BuildRequires: xmlto -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +BuildRequires: gcc +BuildRequires: make %package doc Summary: Documentation for NASM -BuildRequires: ghostscript, texinfo +BuildRequires: perl(Font::TTF::Font) +BuildRequires: perl(Sort::Versions) +BuildRequires: perl(File::Spec) +BuildRequires: adobe-source-sans-pro-fonts +BuildRequires: adobe-source-code-pro-fonts BuildArch: noarch # For arch to noarch conversion Obsoletes: %{name}-doc < %{version}-%{release} @@ -30,7 +34,7 @@ instruction mnemonics and syntax. %description doc This package contains documentation for the Netwide Assembler (NASM), -in HTML, info, PostScript, and text formats. +in HTML, PDF, PostScript, and text formats. %description rdoff Tools for the operating-system independent RDOFF binary format, which @@ -48,21 +52,7 @@ make everything %{?_smp_mflags} gzip -9f doc/nasmdoc.{ps,txt} %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf -install -d $RPM_BUILD_ROOT/%{_infodir} -install -t $RPM_BUILD_ROOT/%{_infodir} doc/info/* - -%post -if [ -e %{_infodir}/nasm.info.gz ]; then - /sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir || : -fi - -%preun -if [ $1 = 0 -a -e %{_infodir}/nasm.info.gz ]; then - /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir || : -fi %files %doc AUTHORS CHANGES README TODO @@ -70,10 +60,9 @@ fi %{_bindir}/ndisasm %{_mandir}/man1/nasm* %{_mandir}/man1/ndisasm* -%{_infodir}/nasm.info*.gz %files doc -%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz +%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz doc/nasmdoc.pdf %files rdoff %{_bindir}/ldrdf @@ -89,6 +78,9 @@ fi %{_mandir}/man1/ld* %changelog +* Tue May 2 2017 Mikolaj Izdebski - 2.13-1 +- Update to upstream version 2.13 + * Fri Feb 10 2017 Fedora Release Engineering - 2.12.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 718ebfb..4cc1ce7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d15843c3fb7db39af80571ee27ec6fad nasm-2.12.02.tar.bz2 -0db3397b65d69e5a75b0e2f5899f2cb9 nasm-2.12.02-xdoc.tar.bz2 +SHA512 (nasm-2.13.tar.bz2) = 8cb85a0d3a5a3487e143d4bc90d5eda9118e9f231b2d94a24dbbd27c676a4e041ac73a9b7fd025f15609799035de6fe3602f49083359cdcbf86c39e67c25f20a +SHA512 (nasm-2.13-xdoc.tar.bz2) = f2c1a897db1615e058c1e673cd646e93275a87ce450beb5436e2071810883785761dcd134e540249451d59d0ef32ec8a5bebe6c034dd77336e4710869f09e3b6