From e124fe363f1e6afafe268d48a1e2537e2223a03e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 3 Jan 2024 10:09:03 -0700 Subject: [PATCH] Complete and correct SPDX migration --- liblouis.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/liblouis.spec b/liblouis.spec index 36da43e..6255a05 100644 --- a/liblouis.spec +++ b/liblouis.spec @@ -3,10 +3,13 @@ Version: 3.28.0 Release: 1%{?dist} Summary: Braille translation and back-translation library -# project moved LGPL-2.1-or-later -# but some files remained under orginal LGPL-3.0-or-later -# cli utils are GPL-3.0-or-later -License: LGPL-2.1-or-later AND LGPL-3.0-or-later AND GPL-3.0-or-later +# LGPL-2.1-or-later: the project as a whole +# LGPL-2.0-or-later: parts of gnulib +# - gnulib/_Noreturn.h +# - gnulib/arg-nonnull.h +# - gnulib/c++defs.h +# - gnulib/warn-on-use.h +License: LGPL-2.1-or-later AND LGPL-2.0-or-later URL: http://liblouis.org Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -45,6 +48,7 @@ Linux. It has, however, gone far beyond these routines. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +License: LGPL-2.1-or-later %description devel The %{name}-devel package contains libraries and header files for @@ -72,7 +76,13 @@ Data tables for liblouis, containing attributes and dot patterns. %package utils Summary: Command-line utilities to test %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -License: GPLv3+ +# GPL-3.0-or-later: the source code in tools +# LGPL-2.0-or-later AND LGPL-2.1-or-later: tools/gnulib +# LGPL-3.0-or-later: tools/gnulib/version-etc.{c,h} +# LGPL-3.0-or-later OR GPL-2.0-or-later: +# - tools/gnulib/unistr/u16-mbtoucr.c +# - tools/gnulib/unistr/u16-to-u8.c +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) %description utils Six test programs are provided as part of the liblouis package. They @@ -84,6 +94,7 @@ them is suitable for braille transcription. Summary: Python 3 language bindings for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} +License: LGPL-2.1-or-later %description -n python3-louis This package provides Python 3 language bindings for %{name}. @@ -93,6 +104,8 @@ This package provides Python 3 language bindings for %{name}. Summary: Documentation for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} +# See doc/liblouis.texi +License: LGPL-3.0-or-later %description doc This package provides the documentation for liblouis. @@ -182,6 +195,7 @@ done - Drop ancient obsoletes - Build the python package with dist-info - Add tables subpackage for the noarch data +- Complete and correct SPDX migration * Thu Jul 20 2023 Fedora Release Engineering - 3.25.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild