From 2206864ec43f0ff43624b1a1878f40101ab5475a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 20 Feb 2023 13:55:51 +0100
Subject: [PATCH] Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
 (LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)"

---
 teckit.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/teckit.spec b/teckit.spec
index 50c8f13..2d9e61e 100644
--- a/teckit.spec
+++ b/teckit.spec
@@ -1,6 +1,6 @@
 Name:           teckit
 Version:        2.5.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Conversion library and mapping compiler
 # COPYING:                      links to license/LICENSING.txt
 # license/License_CPLv05.txt:   CPL-0.5 text, waiting on an SPDX identifer
@@ -40,7 +40,9 @@ Summary:        Conversion library and mapping compiler
 # SFconv/expat/xmlparse/xmlparse.c:     MPL-1.1 OR GPL-1.0-or-later (bundled expat)
 # zlib-1.2.3:           zlib-acknowledgement (see nonexistent zlib.h, reported to
 #                       <https://github.com/silnrsi/teckit/issues/22>)
-License:        (LGPL-2.0-or-later OR CPL-1.0) AND (LGPL-2.0-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)
+# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving
+# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>.
+License:        (LGPL-2.1-or-later OR CPL-1.0) AND (LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)
 URL:            https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit
 Source0:        https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz
 Source1:        https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz.asc
@@ -77,7 +79,9 @@ a human-readable mapping description (a simple text file).
 
 %package devel
 Summary:        Developmental files for TECkit library
-License:        LGPLv2+ or CPL
+# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving
+# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>.
+License:        LGPL-2.1-or-later OR CPL-1.0
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -135,6 +139,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/pkgconfig/teckit.pc
 
 %changelog
+* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.9-12
+- Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
+  (LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)"
+
 * Sat Feb 18 2023 Than Ngo <than@redhat.com> - 2.5.9-11
 - migrated to SPDX license