From 796f31fefa3dfbb21695120ff8848de29a45e4c8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 22 Nov 2023 15:04:21 +0000 Subject: [PATCH] Combine Artistic-1.0-Perl license with GPL-2.0-or-later. --- yasm.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yasm.spec b/yasm.spec index 4968c46..c2b35e7 100644 --- a/yasm.spec +++ b/yasm.spec @@ -3,7 +3,9 @@ Name: yasm Version: 1.3.0 Release: 19%{?dist} # See COPYING for the detail, there is quite a lot! -License: BSD-2-Clause AND BSD-3-Clause AND GPL-1.0-or-later AND GPL-2.0-or-later AND Artistic-1.0-Perl AND LGPL-2.0-or-later +# Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later +# Everything else is BSD. Either 2 or 3 clause. +License: BSD-2-Clause AND BSD-3-Clause AND (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later) URL: http://yasm.tortall.net/ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz @@ -75,7 +77,7 @@ make install DESTDIR=%{buildroot} %changelog -* Wed Sep 20 2023 Nick Clifton - 1.3.0-19 +* Wed Nov 22 2023 Nick Clifton - 1.3.0-19 - Spec File: Migrated to SPDX license. (#2222115) * Sat Jul 22 2023 Fedora Release Engineering - 1.3.0-18