From b8310ffe0a527884d86154ba6f575c536467eb75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Sat, 19 Dec 2020 01:48:13 +0100
Subject: [PATCH] Applying Merlin's patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Will be overwritten with a no-op after it gets merged.

Fedora PR: nasm/1
Signed-off-by: Petr Šabata <contyk@redhat.com>
---
 nasm-SourceSans-font-name.patch | 34 +++++++++++++++++++++++++++++++++
 nasm.spec                       |  8 ++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 nasm-SourceSans-font-name.patch

diff --git a/nasm-SourceSans-font-name.patch b/nasm-SourceSans-font-name.patch
new file mode 100644
index 0000000..baa884c
--- /dev/null
+++ b/nasm-SourceSans-font-name.patch
@@ -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');
+ 
diff --git a/nasm.spec b/nasm.spec
index d43203a..4dd66e7 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -3,11 +3,12 @@
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
 Version: 2.15.03
-Release: 2%{?dist}
+Release: 2.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
@@ -52,7 +53,7 @@ is sometimes used with the Netwide Assembler (NASM). These tools
 include linker, library manager, loader, and information dump.
 
 %prep
-%autosetup
+%autosetup -p1
 
 tar xJf %{SOURCE1} --strip-components 1
 
@@ -95,6 +96,9 @@ make all %{?_smp_mflags}
 %{_mandir}/man1/ld*
 
 %changelog
+* Fri Dec 18 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.15.03-2.1
+- 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