From aad6b17eb557476ca45d9fa20ebd04168f006fcb Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 4 Jan 2021 17:56:41 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nasm.git#18bf7d609a21c881e643d264b68c55ffc5bb3bdc --- nasm-SourceSans-font-name.patch | 7 +++---- nasm.spec | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nasm-SourceSans-font-name.patch b/nasm-SourceSans-font-name.patch index 786da4b..9d4fbb3 100644 --- a/nasm-SourceSans-font-name.patch +++ b/nasm-SourceSans-font-name.patch @@ -1,7 +1,6 @@ -diff --git a/doc/psfonts.ph b/doc/psfonts.ph -index 9ebbe09..49cd4e8 100644 ---- a/doc/psfonts.ph -+++ b/doc/psfonts.ph +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 @@ # diff --git a/nasm.spec b/nasm.spec index 4dd66e7..a534d55 100644 --- a/nasm.spec +++ b/nasm.spec @@ -3,7 +3,7 @@ Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm Version: 2.15.03 -Release: 2.1%{?dist} +Release: 3%{?dist} License: BSD URL: http://www.nasm.us Source0: https://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz @@ -96,7 +96,7 @@ make all %{?_smp_mflags} %{_mandir}/man1/ld* %changelog -* Fri Dec 18 2020 Merlin Mathesius - 2.15.03-2.1 +* Fri Dec 18 2020 Merlin Mathesius - 2.15.03-3 - Patch to workaround renamed SourceSans font family * Tue Jul 28 2020 Fedora Release Engineering - 2.15.03-2