2.5.12 bump

.gitignore

@@ -2,3 +2,7 @@ TECkit_2_5_1.tar.gz
 /teckit-2.5.7.tar.gz
 /teckit-2.5.9.tar.gz
 /teckit-2.5.9.tar.gz.asc
+/teckit-2.5.11.tar.gz
+/teckit-2.5.11.tar.gz.asc
+/teckit-2.5.12.tar.gz
+/teckit-2.5.12.tar.gz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (teckit-2.5.9.tar.gz) = 3c6f1709a553992cf233b87ddcd341b405c29b5f8839de712a4cdd02fda6de9d6f8763feb09a35e50a12a3d408e8a6ac363bb13ba315ba46e080477cdec7165a
-SHA512 (teckit-2.5.9.tar.gz.asc) = 1ad136742f9ca5ddcd70ff2964b0b5ed15c4c4e473ffa151fcbd42c53b3aea58e6709b1baa818a771109379d3e8c2d528031e573ce0ef48ce5002ce8aaa3b225
+SHA512 (teckit-2.5.12.tar.gz) = 52b87a887c37015f2fd52d31e2f2615775463e3cc1978aebcf35816f259693b04d47cfe437f102b0f6c72ab990b6513e3589581eb6e66f145aaf48fcaefa859d
+SHA512 (teckit-2.5.12.tar.gz.asc) = d9769eaef5bede4baf7c77c06898c46c32d179d00f6730f509f41954d80d639b86bf90a5a65f852dadbd40cdf0ec5e54425739e231ae308b09f6eab576c75032

teckit-2.5.9-Correct-indentation.patch

@@ -1,49 +0,0 @@
-From f62b558e1a7403b4a17ed0141c0a799990f27932 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 12 Aug 2019 13:30:43 +0200
-Subject: [PATCH] Correct indentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 9.1.1 complains:
-
-../SFconv/SFconv.cpp:104:5: warning: this 'while' clause does not guard... [-Wmisleading-indentation]
-  104 |     while (in != end && !(in.error() || out.error()))
-      |     ^~~~~
-../SFconv/SFconv.cpp:107:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'while'
-  107 |  if (in.error() || out.error()) {
-      |  ^~
-
-This patch fixes it.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- SFconv/SFconv.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SFconv/SFconv.cpp b/SFconv/SFconv.cpp
-index eeb4490..df6f8a4 100644
---- a/SFconv/SFconv.cpp
-+++ b/SFconv/SFconv.cpp
-@@ -101,7 +101,7 @@ Utf8ToString(const char* s)
- 	utf16::iterator out = buf;
- 	utf8::const_iterator in  = s, 
- 	                     end = s + len;
--    while (in != end && !(in.error() || out.error()))
-+	while (in != end && !(in.error() || out.error()))
-         *out++ = *in++;
-     
- 	if (in.error() || out.error()) {
-@@ -109,7 +109,7 @@ Utf8ToString(const char* s)
- 		exit(1);
- 	}
- 
--    ustring ustr(buf, out - buf);
-+	ustring ustr(buf, out - buf);
- 	delete[] buf;
- 	return ustr;
- }
--- 
-2.21.0
-

teckit.rpmlintrc

@@ -1,2 +1 @@
-from Config import *
-addFilter("unversioned-explicit-provides bundels\(graphite2\)");
+addFilter('unversioned-explicit-provides bundels\(graphite2\)')

teckit.spec

@@ -1,52 +1,54 @@
 Name:           teckit
-Version:        2.5.9
-Release:        9%{?dist}
-Summary:        Conversion library and mapping compiler
+Version:        2.5.12
+Release:        1%{?dist}
+Summary:        Encoding conversion library and mapping compiler
 # COPYING:                      links to license/LICENSING.txt
-# license/License_CPLv05.txt:   CPLv0.5 text
-# license/License_LGPLv21.txt:  LGPLv2 text
+# license/License_CPLv05.txt:   CPL-1.0 text, "0.5" version in the license
+#                               title is irrelevant
+#                               <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
+# license/License_LGPLv21.txt:  LGPL-2.1 text
 # license/LICENSING.txt:        license declarations
-# SFconv/UtfCodec.cpp:      LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
-# SFconv/UtfCodec.h:        LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
-#                           <https://github.com/silnrsi/graphite/issues/58>,
-#                           graphite2 package uses "MPL"
-# source/Engine.cpp:        LGPLv2+ or CPL
-# source/TECkit_Format.h:   LGPLv2+ or CPL
+# SFconv/UtfCodec.cpp:      LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
+# SFconv/UtfCodec.h:        LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
+#                           MPL version clarified at <https://github.com/silnrsi/graphite/issues/58>,
+# source/Engine.cpp:        LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already
+#                           encompases "or later" choice
+#                           <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
+# source/TECkit_Format.h:   LGPL-2.1-or-later OR CPL-0.5-or-later
 ## Not in any binary package
 # aclocal.m4:           FSFULLR
-# compile:              GPLv2+ with exceptions
-# config.guess:         GPLv3+ with exceptions
-# config.sub:           GPLv3+ with exceptions
-# configure:            FSFUL and GPLv2+ with exceptions
-# depcomp:              GPLv2+ with exceptions
-# install-sh:           MIT
-# lib/Makefile.in:      FSFULLR
-# ltmain.sh:            GPLv2+ with exceptions and GPLv3+ with exceptions and GPLv3+
-# m4/libtool.m4:        FSFULL and FSFULLR and GPLv2+ with exceptions
+# compile:              GPL-2.0-or-later WITH Autoconf-exception-generic
+#                       <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>
+# config.guess:         GPL-3.0-or-later WITH Autoconf-exception-generic
+# config.sub:           GPL-3.0-or-later WITH Autoconf-exception-generic
+# configure:            FSFUL AND GPL-2.0-or-later WITH Libtool-exception
+# depcomp:              GPL-2.0-or-later WITH Autoconf-exception-generic
+# install-sh:           X11
+# lib/Makefile.in:      FSFULLRWD
+# ltmain.sh:            GPL-2.0-or-later WITH Libtool-exception AND
+#                       GPL-3.0-or-later WITH Libtool-exception AND GPL-3.0-or-later
+# m4/libtool.m4:        FSFULL AND FSFULLR AND GPL-2.0-or-later WITH Libtool-exception
 # m4/ltoptions.m4:      FSFULLR
 # m4/ltsugar.m4:        FSFULLR
 # m4/ltversion.m4:      FSFULLR
 # m4/lt~obsolete.m4:    FSFULLR
-# Makefile.in:          FSFULLR
-# missing:              GPLv2+ with exceptions
-# test-driver:          GPLv2+ with exceptions
-# test/Makefile.in:     FSFULLR
+# Makefile.in:          FSFULLRWD
+# missing:              GPL-2.0-or-later WITH Autoconf-exception-generic
+# test-driver:          GPL-2.0-or-later WITH Autoconf-exception-generic
+# test/Makefile.in:     FSFULLRWD
 ## Unbundled
-# SFconv/expat/xmlparse/hashtable.c:    MPLv1.1 of GPL+ (bundled expat)
-# SFconv/expat/xmlparse/xmlparse.c:     MPLv1.1 of GPL+ (bundled expat)
-# zlib-1.2.3:           zlib (see nonexistent zlib.h, reported to
-#                       <https://github.com/silnrsi/teckit/issues/22>)
-License:        (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1)
-URL:            https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit
+# SFconv/expat/xmlparse/hashtable.c:    MPL-1.1 OR GPL-1.0-or-later (bundled expat)
+# SFconv/expat/xmlparse/xmlparse.c:     MPL-1.1 OR GPL-1.0-or-later (bundled expat)
+# zlib-1.2.3:           "sse copyright notice in zlib.h"
+# zlib-1.2.3/zlib.h:    zlib-acknowledgement
+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)
+URL:            https://software.sil.org/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
 # Exported from ppisar's keyring
 Source2:        gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
-# Fix a compiler warning about a misindentation,
-# <https://github.com/silnrsi/teckit/pull/23>
-Patch0:         teckit-2.5.9-Correct-indentation.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
+BuildRequires:  autoconf >= 2.54
+BuildRequires:  automake >= 1.11
 BuildRequires:  coreutils
 BuildRequires:  expat-devel
 # gcc is not needed, the only source/NormalizationData.c is included into
@@ -73,7 +75,7 @@ a human-readable mapping description (a simple text file).
 
 %package devel
 Summary:        Developmental files for TECkit library
-License:        LGPLv2+ or CPL
+License:        LGPL-2.1-or-later OR CPL-1.0
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -82,14 +84,13 @@ that use TECkit, a character encoding and mapping, library.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%setup -q
-%patch0 -p1
+%autosetup -p1
 # Remove bundled libraries
-rm -r zlib-*/*.c SFconv/expat
-# Regenerate build script
-autoreconf -fi
+rm -r zlib-*/*.{c,h} SFconv/expat
 
 %build
+# Regenerate a build script
+autoreconf -fi
 %configure \
     --disable-debug \
     --disable-final \
@@ -121,16 +122,33 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/libTECkit.so.0.*
 %{_libdir}/libTECkit_Compiler.so.0
 %{_libdir}/libTECkit_Compiler.so.0.*
-%{_mandir}/man1/*
+%{_mandir}/man1/sfconv.*
+%{_mandir}/man1/teckit_compile.*
+%{_mandir}/man1/txtconv.*
 
 %files devel
 %doc docs/*.pdf
-%{_includedir}/teckit/
+%{_includedir}/teckit
 %{_libdir}/libTECkit.so
 %{_libdir}/libTECkit_Compiler.so
 %{_libdir}/pkgconfig/teckit.pc
 
 %changelog
+* Mon Aug 28 2023 Petr Pisar <ppisar@redhat.com> - 2.5.12-1
+- 2.5.12 bump
+- 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)"
+
+* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.11-1
+- 2.5.11 bump
+
+* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.9-11
+- 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-10
+- migrated to SPDX license
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild