Compare commits

..

No commits in common. 'i8c' and 'c9' have entirely different histories.
i8c ... c9

@ -0,0 +1,34 @@
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');

@ -1,19 +1,20 @@
# Build without documentation per default if built as part of a module. %if 0%{?rhel} > 0
%if 0%{?_module_build} # On RHEL we default to building WITHOUT documentation.
%bcond_with documentation %bcond_with documentation
%else %else
# XXX adobe fonts no longer supported, so building with documentation is now suppressed. # Default to building WITH documentation.
%bcond_with documentation %bcond_without documentation
%endif %endif
Summary: A portable x86 assembler which uses Intel-like syntax Summary: A portable x86 assembler which uses Intel-like syntax
Name: nasm Name: nasm
Version: 2.15.03 Version: 2.15.03
Release: 3%{?dist} Release: 7%{?dist}
License: BSD License: BSD
URL: http://www.nasm.us URL: http://www.nasm.us
Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz 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 Source1: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.xz
Patch0: nasm-SourceSans-font-name.patch
BuildRequires: perl(Env) BuildRequires: perl(Env)
BuildRequires: autoconf BuildRequires: autoconf
@ -58,7 +59,7 @@ is sometimes used with the Netwide Assembler (NASM). These tools
include linker, library manager, loader, and information dump. include linker, library manager, loader, and information dump.
%prep %prep
%autosetup %autosetup -p1
tar xJf %{SOURCE1} --strip-components 1 tar xJf %{SOURCE1} --strip-components 1
@ -101,20 +102,42 @@ make all %{?_smp_mflags}
%{_mandir}/man1/ld* %{_mandir}/man1/ld*
%changelog %changelog
* Thu Dec 07 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.15.03-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-7
- Rebuilt for MSVSphere 8.8 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.15.03-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Mar 09 2021 Nick Clifton <nickc@redhat.com> - 2.15.03-5
- Default to building without documentation for RHEL. (#1933222)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Dec 18 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.15.03-3
- Patch to workaround renamed SourceSans font family
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.03-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.15.03-1
- Update to 2.15.03
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.02-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Nov 11 2020 Martin Cermak <mcermak@redhat.com> - 2.15.03-3 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.02-2
- NVR bump and rebuild for CI gating purposes. - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Oct 30 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-2 * Wed Apr 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.14.02-1
- Remove gatimg.yaml as no gating tests are needed. - Update to 2.14.02
* Thu Oct 29 2020 Nick Clifton <nickc@redhat.com> - 2.15.03-1 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.03-3
- Rebase to 2.15. (#1889815) - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-2 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.03-2
- Suppress documentation building as the required fonts are no longer available. #1610010 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-1 * Thu Feb 08 2018 Michael Simacek <msimacek@redhat.com> - 2.13.03-1
- Update to upstream version 2.13.03 - Update to upstream version 2.13.03

Loading…
Cancel
Save