update to 2.16.01 (#2155636)

drop obsolete patch
drop rdoff subpackage (discontinued upstream)
This commit is contained in:
Dominik Mierzejewski 2023-01-04 13:40:45 +01:00
parent f237d58b05
commit 982356dfaa
4 changed files with 12 additions and 61 deletions

2
.gitignore vendored
View File

@ -60,3 +60,5 @@ nasm-2.08.01-xdoc.tar.bz2
/nasm-2.15.03.tar.xz
/nasm-2.15.05-xdoc.tar.xz
/nasm-2.15.05.tar.xz
/nasm-2.16.01-xdoc.tar.xz
/nasm-2.16.01.tar.xz

View File

@ -1,34 +0,0 @@
diff -ru ../nasm-2.15.03.ORIG/doc/psfonts.ph ./doc/psfonts.ph
--- ../nasm-2.15.03.ORIG/doc/psfonts.ph 2020-07-17 20:04:07.000000000 -0500
+++ ./doc/psfonts.ph 2020-12-18 13:45:50.177731896 -0600
@@ -4,22 +4,22 @@
#
# Font substitution lists, in order of preference
-my @TText = ('SourceSansPro-Bold', 'ClearSans-Bold', 'LiberationSans-Bold',
+my @TText = ('SourceSansPro-Bold', 'SourceSans3-Bold', 'ClearSans-Bold', 'LiberationSans-Bold',
'Arial-Bold', 'Helvetica-Bold');
-my @TItal = ('SourceSansPro-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic',
+my @TItal = ('SourceSansPro-BoldIt', 'SourceSans3-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic',
'Arial-BoldItalic', 'Helvetica-BoldItalic');
my @TCode = ('SourceCodePro-Bold', 'LiberationMono-Bold', 'Courier-Bold');
-my @HText = ('SourceSansPro-Semibold', 'ClearSans-Bold', 'Arial-Bold', 'Helvetica-Bold');
-my @HItal = ('SourceSansPro-SemiboldIt', 'ClearSans-BoldItalic',
+my @HText = ('SourceSansPro-Semibold', 'SourceSans3-Semibold', 'ClearSans-Bold', 'Arial-Bold', 'Helvetica-Bold');
+my @HItal = ('SourceSansPro-SemiboldIt', 'SourceSans3-SemiboldIt', 'ClearSans-BoldItalic',
'Arial-BoldItalic', 'Helvetica-BoldItalic');
my @HCode = ('SourceCodePro-Semibold', 'LiberationMono-Bold', 'Courier-Bold');
-my @BText = ('SourceSansPro-Regular', 'ClearSans', 'LiberationSans', 'Arial', 'Helvetica');
-my @BItal = ('SourceSansPro-It', 'ClearSans-Italic', 'LiberationSans-Italic',
+my @BText = ('SourceSansPro-Regular', 'SourceSans3-Regular', 'ClearSans', 'LiberationSans', 'Arial', 'Helvetica');
+my @BItal = ('SourceSansPro-It', 'SourceSans3-It', 'ClearSans-Italic', 'LiberationSans-Italic',
'Arial-Italic', 'Helvetica-Italic');
my @BCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');
-my @QText = ('SourceSansPro-It', 'ClearSans-Italic', 'LiberationSans-Italic',
+my @QText = ('SourceSansPro-It', 'SourceSans3-It', 'ClearSans-Italic', 'LiberationSans-Italic',
'Arial-Italic', 'Helvetica-Italic');
-my @QBold = ('SourceSansPro-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic', 'Arial-Bold', 'Helvetica-BoldItalic');
+my @QBold = ('SourceSansPro-BoldIt', 'SourceSans3-BoldIt', 'ClearSans-BoldItalic', 'LiberationSans-BoldItalic', 'Arial-Bold', 'Helvetica-BoldItalic');
my @QCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');
my @XCode = ('SourceCodePro-Regular', 'LiberationMono', 'Courier');

View File

@ -8,13 +8,12 @@
Summary: A portable x86 assembler which uses Intel-like syntax
Name: nasm
Version: 2.15.05
Release: 3%{?dist}
Version: 2.16.01
Release: 1%{?dist}
License: BSD
URL: http://www.nasm.us
Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz
Source1: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.xz
Patch0: nasm-SourceSans-font-name.patch
BuildRequires: perl(Env)
BuildRequires: autoconf
@ -39,9 +38,6 @@ BuildArch: noarch
Obsoletes: %{name}-doc < %{version}-%{release}
%endif
%package rdoff
Summary: Tools for the RDOFF binary format, sometimes used with NASM
%description
NASM is the Netwide Assembler, a free portable assembler for the Intel
80x86 microprocessor series, using primarily the traditional Intel
@ -53,11 +49,6 @@ This package contains documentation for the Netwide Assembler (NASM),
in HTML, PDF, PostScript, and text formats.
%endif
%description rdoff
Tools for the operating-system independent RDOFF binary format, which
is sometimes used with the Netwide Assembler (NASM). These tools
include linker, library manager, loader, and information dump.
%prep
%autosetup -p1
@ -73,7 +64,7 @@ make all %{?_smp_mflags}
%endif
%install
%make_install install_rdf
%make_install
%check
make -C test golden test diff
@ -91,20 +82,12 @@ make -C test golden test diff
%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz doc/nasmdoc.pdf
%endif
%files rdoff
%{_bindir}/ldrdf
%{_bindir}/rdf2bin
%{_bindir}/rdf2ihx
%{_bindir}/rdf2com
%{_bindir}/rdfdump
%{_bindir}/rdflib
%{_bindir}/rdx
%{_bindir}/rdf2ith
%{_bindir}/rdf2srec
%{_mandir}/man1/rd*
%{_mandir}/man1/ld*
%changelog
* Wed Jan 04 2023 Dominik Mierzejewski <rpm@greysector.net> - 2.16.01-1
- update to 2.16.01 (#2155636)
- drop obsolete patch
- drop rdoff subpackage (discontinued upstream)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.05-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (nasm-2.15.05-xdoc.tar.xz) = 1a7b27b14834e1b0c3d656fe5ab0f69c0773fb86e8ef5367fd2869e266d5e3441aed0b11e1c19c97c14413d25f3e6e7b3c012a356692af3ce40db2ee1f36b2ce
SHA512 (nasm-2.15.05.tar.xz) = 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7
SHA512 (nasm-2.16.01-xdoc.tar.xz) = ec260c0a537b0172e6f2ac17118c744db8743886388a112e99bab1b8c8fee91547dade69dcfe9a15289b2b1a428e8c009048a468f7982b03dd4506abcafc0787
SHA512 (nasm-2.16.01.tar.xz) = 51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833