From 7350649f9272768ca38465cb98740f0f0bac514f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:47:54 +0000 Subject: [PATCH 01/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 1cdda6b..ad77dfe 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPLv0.5 text @@ -131,6 +131,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.5.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.5.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c20e8c9eefaf36824057a87db71c7f4c46755ff7 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 18 Feb 2023 21:24:01 +0100 Subject: [PATCH 02/19] migrated to SPDX license --- teckit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/teckit.spec b/teckit.spec index ad77dfe..a20cc84 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPLv0.5 text @@ -36,7 +36,7 @@ Summary: Conversion library and mapping compiler # SFconv/expat/xmlparse/xmlparse.c: MPLv1.1 of GPL+ (bundled expat) # zlib-1.2.3: zlib (see nonexistent zlib.h, reported to # ) -License: (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1) +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) 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 @@ -131,6 +131,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Feb 18 2023 Than Ngo - 2.5.9-11 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 2.5.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fb7f4062aaba5d92da2a68f9c82bb91fc9301c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 13:47:35 +0100 Subject: [PATCH 03/19] Convert license comments to SPDX --- teckit.spec | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/teckit.spec b/teckit.spec index a20cc84..50c8f13 100644 --- a/teckit.spec +++ b/teckit.spec @@ -3,38 +3,42 @@ Version: 2.5.9 Release: 11%{?dist} Summary: 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-0.5 text, waiting on an SPDX identifer +# +# 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) +# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) +# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) # , # graphite2 package uses "MPL" -# source/Engine.cpp: LGPLv2+ or CPL -# source/TECkit_Format.h: LGPLv2+ or CPL +# source/Engine.cpp: LGPL-2.1-or-later OR CPL-0.5-or-later +# +# 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 +# +# 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 +# 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: zlib-acknowledgement (see nonexistent zlib.h, reported to # ) 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) URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit From 2206864ec43f0ff43624b1a1878f40101ab5475a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 13:55:51 +0100 Subject: [PATCH 04/19] 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 # ) -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 +# . +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 +# . +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 - 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 - 2.5.9-11 - migrated to SPDX license From 3119dcdea87a0d1dd1f46bbfd4c52dc8f7869efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 15:22:59 +0100 Subject: [PATCH 05/19] 2.5.11 bump --- .gitignore | 2 ++ sources | 4 +-- teckit-2.5.9-Correct-indentation.patch | 49 -------------------------- teckit.spec | 26 +++++++------- 4 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 teckit-2.5.9-Correct-indentation.patch diff --git a/.gitignore b/.gitignore index 63605ae..2120f92 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ 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 diff --git a/sources b/sources index b309ba7..87e5dc1 100644 --- a/sources +++ b/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.11.tar.gz) = 9b3bb850cf52ba4d8658a9bab41305df103fc62706524c5602e05a89f02c0c65a35f60bd4bd3cebff3ee989b5a4d6c73afd72e79ee44d6ef7b3f2eb052fde2c1 +SHA512 (teckit-2.5.11.tar.gz.asc) = 4e4f4794485ff371b333bc442ee234b0d238763526b286373824b6b69886ae2402f35e37ca72ee8060405e54eae03c859942ffe9409f2809f99572a3faf5ac3d diff --git a/teckit-2.5.9-Correct-indentation.patch b/teckit-2.5.9-Correct-indentation.patch deleted file mode 100644 index 2e48aac..0000000 --- a/teckit-2.5.9-Correct-indentation.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f62b558e1a7403b4a17ed0141c0a799990f27932 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -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ř ---- - 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 - diff --git a/teckit.spec b/teckit.spec index 2d9e61e..d05d0a2 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit -Version: 2.5.9 -Release: 12%{?dist} +Version: 2.5.11 +Release: 1%{?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 @@ -38,8 +38,9 @@ Summary: Conversion library and mapping compiler ## Unbundled # 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: zlib-acknowledgement (see nonexistent zlib.h, reported to -# ) +# zlib-1.2.3: "sse copyright notice in zlib.h" +# zlib-1.2.3/zlib.h: zlib-acknowledgement +# # TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving # . 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) @@ -48,11 +49,8 @@ Source0: https://github.com/silnrsi/teckit/releases/download/v%{version}/ 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, -# -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 @@ -90,14 +88,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 %build +# Regenerate a build script +autoreconf -fi %configure \ --disable-debug \ --disable-final \ @@ -139,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Mon Feb 20 2023 Petr Pisar - 2.5.11-1 +- 2.5.11 bump + * Mon Feb 20 2023 Petr Pisar - 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)" From a70f5d8b2abe69a372a639fb807e450de0fc4947 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 18 Feb 2023 21:24:01 +0100 Subject: [PATCH 06/19] migrated to SPDX license --- teckit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/teckit.spec b/teckit.spec index 1cdda6b..602f680 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPLv0.5 text @@ -36,7 +36,7 @@ Summary: Conversion library and mapping compiler # SFconv/expat/xmlparse/xmlparse.c: MPLv1.1 of GPL+ (bundled expat) # zlib-1.2.3: zlib (see nonexistent zlib.h, reported to # ) -License: (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1) +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) 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 @@ -131,6 +131,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Feb 18 2023 Than Ngo - 2.5.9-10 +- migrated to SPDX license + * Sat Jul 23 2022 Fedora Release Engineering - 2.5.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5a83ec54ac20dbfe700d8536c488edc5f864a03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 13:47:35 +0100 Subject: [PATCH 07/19] Convert license comments to SPDX --- teckit.spec | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/teckit.spec b/teckit.spec index 602f680..06aed2a 100644 --- a/teckit.spec +++ b/teckit.spec @@ -3,38 +3,42 @@ Version: 2.5.9 Release: 10%{?dist} Summary: 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-0.5 text, waiting on an SPDX identifer +# +# 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) +# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) +# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) # , # graphite2 package uses "MPL" -# source/Engine.cpp: LGPLv2+ or CPL -# source/TECkit_Format.h: LGPLv2+ or CPL +# source/Engine.cpp: LGPL-2.1-or-later OR CPL-0.5-or-later +# +# 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 +# +# 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 +# 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: zlib-acknowledgement (see nonexistent zlib.h, reported to # ) 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) URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit From e3b3258a2b44e1ffc9c55da9c2c09088256d102f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 13:55:51 +0100 Subject: [PATCH 08/19] 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 06aed2a..856aa9c 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.9 -Release: 10%{?dist} +Release: 11%{?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 # ) -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 +# . +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 +# . +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 - 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 - 2.5.9-10 - migrated to SPDX license From 378036956826a3a10f5f4a51266b90a690af0393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 20 Feb 2023 15:22:59 +0100 Subject: [PATCH 09/19] 2.5.11 bump --- .gitignore | 2 ++ sources | 4 +-- teckit-2.5.9-Correct-indentation.patch | 49 -------------------------- teckit.spec | 26 +++++++------- 4 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 teckit-2.5.9-Correct-indentation.patch diff --git a/.gitignore b/.gitignore index 63605ae..2120f92 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ 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 diff --git a/sources b/sources index b309ba7..87e5dc1 100644 --- a/sources +++ b/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.11.tar.gz) = 9b3bb850cf52ba4d8658a9bab41305df103fc62706524c5602e05a89f02c0c65a35f60bd4bd3cebff3ee989b5a4d6c73afd72e79ee44d6ef7b3f2eb052fde2c1 +SHA512 (teckit-2.5.11.tar.gz.asc) = 4e4f4794485ff371b333bc442ee234b0d238763526b286373824b6b69886ae2402f35e37ca72ee8060405e54eae03c859942ffe9409f2809f99572a3faf5ac3d diff --git a/teckit-2.5.9-Correct-indentation.patch b/teckit-2.5.9-Correct-indentation.patch deleted file mode 100644 index 2e48aac..0000000 --- a/teckit-2.5.9-Correct-indentation.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f62b558e1a7403b4a17ed0141c0a799990f27932 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -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ř ---- - 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 - diff --git a/teckit.spec b/teckit.spec index 856aa9c..59ee1c1 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit -Version: 2.5.9 -Release: 11%{?dist} +Version: 2.5.11 +Release: 1%{?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 @@ -38,8 +38,9 @@ Summary: Conversion library and mapping compiler ## Unbundled # 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: zlib-acknowledgement (see nonexistent zlib.h, reported to -# ) +# zlib-1.2.3: "sse copyright notice in zlib.h" +# zlib-1.2.3/zlib.h: zlib-acknowledgement +# # TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving # . 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) @@ -48,11 +49,8 @@ Source0: https://github.com/silnrsi/teckit/releases/download/v%{version}/ 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, -# -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 @@ -90,14 +88,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 %build +# Regenerate a build script +autoreconf -fi %configure \ --disable-debug \ --disable-final \ @@ -139,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Mon Feb 20 2023 Petr Pisar - 2.5.11-1 +- 2.5.11 bump + * Mon Feb 20 2023 Petr Pisar - 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)" From 8d3f0a1fe9dff4589dd6aeaf43d3cbd16ea36c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 22 Feb 2023 14:01:32 +0100 Subject: [PATCH 10/19] CPL-1.0 license is identical to "CPL 0.5 or later" --- teckit.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/teckit.spec b/teckit.spec index d05d0a2..34078dc 100644 --- a/teckit.spec +++ b/teckit.spec @@ -3,7 +3,8 @@ Version: 2.5.11 Release: 1%{?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 +# license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license +# title is irrelevant # # license/License_LGPLv21.txt: LGPL-2.1 text # license/LICENSING.txt: license declarations @@ -11,7 +12,8 @@ Summary: Conversion library and mapping compiler # SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) # , # graphite2 package uses "MPL" -# source/Engine.cpp: LGPL-2.1-or-later OR CPL-0.5-or-later +# source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already +# encompases "or later" choice # # source/TECkit_Format.h: LGPL-2.1-or-later OR CPL-0.5-or-later ## Not in any binary package @@ -40,9 +42,6 @@ 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: "sse copyright notice in zlib.h" # zlib-1.2.3/zlib.h: zlib-acknowledgement -# -# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving -# . 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 From a730e65f5a3a83b3cb76ba1974267e377df8da3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:21:43 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 34078dc..7c04e18 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -135,6 +135,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.5.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 20 2023 Petr Pisar - 2.5.11-1 - 2.5.11 bump From bcd594d6e0f537b46250888895f2e67e353070d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 28 Aug 2023 16:26:06 +0200 Subject: [PATCH 12/19] 2.5.12 bump --- .gitignore | 2 ++ sources | 4 ++-- teckit.rpmlintrc | 3 +-- teckit.spec | 32 ++++++++++++++++++-------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 2120f92..52d575d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ TECkit_2_5_1.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 diff --git a/sources b/sources index 87e5dc1..8c234e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (teckit-2.5.11.tar.gz) = 9b3bb850cf52ba4d8658a9bab41305df103fc62706524c5602e05a89f02c0c65a35f60bd4bd3cebff3ee989b5a4d6c73afd72e79ee44d6ef7b3f2eb052fde2c1 -SHA512 (teckit-2.5.11.tar.gz.asc) = 4e4f4794485ff371b333bc442ee234b0d238763526b286373824b6b69886ae2402f35e37ca72ee8060405e54eae03c859942ffe9409f2809f99572a3faf5ac3d +SHA512 (teckit-2.5.12.tar.gz) = 52b87a887c37015f2fd52d31e2f2615775463e3cc1978aebcf35816f259693b04d47cfe437f102b0f6c72ab990b6513e3589581eb6e66f145aaf48fcaefa859d +SHA512 (teckit-2.5.12.tar.gz.asc) = d9769eaef5bede4baf7c77c06898c46c32d179d00f6730f509f41954d80d639b86bf90a5a65f852dadbd40cdf0ec5e54425739e231ae308b09f6eab576c75032 diff --git a/teckit.rpmlintrc b/teckit.rpmlintrc index f1056b6..98f1160 100644 --- a/teckit.rpmlintrc +++ b/teckit.rpmlintrc @@ -1,2 +1 @@ -from Config import * -addFilter("unversioned-explicit-provides bundels\(graphite2\)"); +addFilter('unversioned-explicit-provides bundels\(graphite2\)') diff --git a/teckit.spec b/teckit.spec index 7c04e18..820c372 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,17 +1,16 @@ Name: teckit -Version: 2.5.11 -Release: 2%{?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: CPL-1.0 text, "0.5" version in the license # title is irrelevant # # license/License_LGPLv21.txt: LGPL-2.1 text # license/LICENSING.txt: license declarations -# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) -# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) -# , -# graphite2 package uses "MPL" +# 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 , # source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already # encompases "or later" choice # @@ -42,8 +41,8 @@ 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: "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 OR MPL-1.1) -URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit +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 @@ -76,8 +75,6 @@ a human-readable mapping description (a simple text file). %package devel Summary: Developmental files for TECkit library -# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving -# . License: LGPL-2.1-or-later OR CPL-1.0 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -89,7 +86,7 @@ that use TECkit, a character encoding and mapping, library. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 # Remove bundled libraries -rm -r zlib-*/*.c SFconv/expat +rm -r zlib-*/*.{c,h} SFconv/expat %build # Regenerate a build script @@ -125,16 +122,23 @@ 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 - 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)" + * Sat Jul 22 2023 Fedora Release Engineering - 2.5.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 09f577ac827af2e86511ca2d589a712e970a3d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 22 Feb 2023 14:01:32 +0100 Subject: [PATCH 13/19] CPL-1.0 license is identical to "CPL 0.5 or later" --- teckit.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/teckit.spec b/teckit.spec index 59ee1c1..dfd99eb 100644 --- a/teckit.spec +++ b/teckit.spec @@ -3,7 +3,8 @@ Version: 2.5.11 Release: 1%{?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 +# license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license +# title is irrelevant # # license/License_LGPLv21.txt: LGPL-2.1 text # license/LICENSING.txt: license declarations @@ -11,7 +12,8 @@ Summary: Conversion library and mapping compiler # SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) # , # graphite2 package uses "MPL" -# source/Engine.cpp: LGPL-2.1-or-later OR CPL-0.5-or-later +# source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already +# encompases "or later" choice # # source/TECkit_Format.h: LGPL-2.1-or-later OR CPL-0.5-or-later ## Not in any binary package @@ -40,9 +42,6 @@ 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: "sse copyright notice in zlib.h" # zlib-1.2.3/zlib.h: zlib-acknowledgement -# -# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving -# . 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 From 6859a0ef2db1da827118d6003fc656a8186f121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 28 Aug 2023 16:26:06 +0200 Subject: [PATCH 14/19] 2.5.12 bump --- .gitignore | 2 ++ sources | 4 ++-- teckit.rpmlintrc | 3 +-- teckit.spec | 30 +++++++++++++++++------------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 2120f92..52d575d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ TECkit_2_5_1.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 diff --git a/sources b/sources index 87e5dc1..8c234e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (teckit-2.5.11.tar.gz) = 9b3bb850cf52ba4d8658a9bab41305df103fc62706524c5602e05a89f02c0c65a35f60bd4bd3cebff3ee989b5a4d6c73afd72e79ee44d6ef7b3f2eb052fde2c1 -SHA512 (teckit-2.5.11.tar.gz.asc) = 4e4f4794485ff371b333bc442ee234b0d238763526b286373824b6b69886ae2402f35e37ca72ee8060405e54eae03c859942ffe9409f2809f99572a3faf5ac3d +SHA512 (teckit-2.5.12.tar.gz) = 52b87a887c37015f2fd52d31e2f2615775463e3cc1978aebcf35816f259693b04d47cfe437f102b0f6c72ab990b6513e3589581eb6e66f145aaf48fcaefa859d +SHA512 (teckit-2.5.12.tar.gz.asc) = d9769eaef5bede4baf7c77c06898c46c32d179d00f6730f509f41954d80d639b86bf90a5a65f852dadbd40cdf0ec5e54425739e231ae308b09f6eab576c75032 diff --git a/teckit.rpmlintrc b/teckit.rpmlintrc index f1056b6..98f1160 100644 --- a/teckit.rpmlintrc +++ b/teckit.rpmlintrc @@ -1,2 +1 @@ -from Config import * -addFilter("unversioned-explicit-provides bundels\(graphite2\)"); +addFilter('unversioned-explicit-provides bundels\(graphite2\)') diff --git a/teckit.spec b/teckit.spec index dfd99eb..582d353 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,17 +1,16 @@ Name: teckit -Version: 2.5.11 +Version: 2.5.12 Release: 1%{?dist} -Summary: Conversion library and mapping compiler +Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license # title is irrelevant # # license/License_LGPLv21.txt: LGPL-2.1 text # license/LICENSING.txt: license declarations -# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) -# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2) -# , -# graphite2 package uses "MPL" +# 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 , # source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already # encompases "or later" choice # @@ -42,8 +41,8 @@ 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: "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 OR MPL-1.1) -URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit +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 @@ -76,8 +75,6 @@ a human-readable mapping description (a simple text file). %package devel Summary: Developmental files for TECkit library -# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving -# . License: LGPL-2.1-or-later OR CPL-1.0 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -89,7 +86,7 @@ that use TECkit, a character encoding and mapping, library. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 # Remove bundled libraries -rm -r zlib-*/*.c SFconv/expat +rm -r zlib-*/*.{c,h} SFconv/expat %build # Regenerate a build script @@ -125,16 +122,23 @@ 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 - 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 - 2.5.11-1 - 2.5.11 bump From f115d8df267645ebd6d0fc70c9cc37e002947967 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:41:38 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 820c372..52fdbf0 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -134,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.5.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Aug 28 2023 Petr Pisar - 2.5.12-1 - 2.5.12 bump - Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND From 0f3e49b712fbd53193baa0b7e34c044a029633ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:12:59 +0000 Subject: [PATCH 16/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 52fdbf0..e1ce871 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -134,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.5.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.5.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e7baea3bba85eca9424abe94bf8d2516347136f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:32:17 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index e1ce871..7f1039b 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -134,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.5.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.5.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d328404e2686ba3904daa909a918da2d2e39be0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Tue, 8 Jul 2025 09:50:26 +0200 Subject: [PATCH 18/19] tests: migrate from STI to TMT Related: https://fedoraproject.org/wiki/Changes/DisableSTI --- .fmf/version | 1 + plans/ci.fmf | 5 +++++ tests/smoke-functionality/Makefile | 2 +- tests/smoke-functionality/main.fmf | 14 ++++++++++++++ tests/smoke-functionality/runtest.sh | 1 - tests/tests.yml | 11 ----------- 6 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/ci.fmf create mode 100644 tests/smoke-functionality/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke-functionality/Makefile b/tests/smoke-functionality/Makefile index 5670168..9b27478 100644 --- a/tests/smoke-functionality/Makefile +++ b/tests/smoke-functionality/Makefile @@ -56,7 +56,7 @@ $(METADATA): Makefile @echo "Type: Sanity" >> $(METADATA) @echo "TestTime: 5m" >> $(METADATA) @echo "RunFor: teckit" >> $(METADATA) - @echo "Requires: teckit" >> $(METADATA) + @echo "Requires: teckit bash coreutils man-db" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: LGPLv2+ or CPL" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) diff --git a/tests/smoke-functionality/main.fmf b/tests/smoke-functionality/main.fmf new file mode 100644 index 0000000..9514e77 --- /dev/null +++ b/tests/smoke-functionality/main.fmf @@ -0,0 +1,14 @@ +summary: tests basic functionality +contact: Than Ngo +component: + - teckit +test: ./runtest.sh +framework: beakerlib +require: + - bash + - coreutils + - man-db + - teckit +duration: 5m +extra-summary: /CoreOS/teckit/smoke-functionality +extra-task: /CoreOS/teckit/smoke-functionality diff --git a/tests/smoke-functionality/runtest.sh b/tests/smoke-functionality/runtest.sh index 804e753..8a61228 100755 --- a/tests/smoke-functionality/runtest.sh +++ b/tests/smoke-functionality/runtest.sh @@ -27,7 +27,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="teckit" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c01163c..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - smoke-functionality - required_packages: - - teckit From b3f169c3508824afab8134398bc96ea05ba828a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:10:16 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- teckit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/teckit.spec b/teckit.spec index 7f1039b..d67dc82 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Encoding conversion library and mapping compiler # COPYING: links to license/LICENSING.txt # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license @@ -134,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/teckit.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.5.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.5.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild