.gitignore

@@ -1 +1,2 @@
-SOURCES/teckit-2.5.8.tar.gz
+SOURCES/gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
+SOURCES/teckit-2.5.9.tar.gz

.teckit.metadata

@@ -1 +1,2 @@
-1936b15a169e547835821a64d9ff200b2d2ff9b0 SOURCES/teckit-2.5.8.tar.gz
+8450ab45b9f7efa4eb9114afdb3118aab5424637 SOURCES/gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
+84d81aa28c1689d9db6dc6fb9bcf96e3d131e0cd SOURCES/teckit-2.5.9.tar.gz

SOURCES/TECkit_2_5_1-includes.patch

@@ -1,11 +0,0 @@
-diff -ru TECkit_2_5_1.orig/source/Compiler.cpp TECkit_2_5_1/source/Compiler.cpp
---- TECkit_2_5_1.orig/source/Compiler.cpp	2009-03-05 10:29:22.000000000 +0000
-+++ TECkit_2_5_1/source/Compiler.cpp	2009-03-05 10:29:50.000000000 +0000
-@@ -33,6 +33,7 @@
- #include <iomanip>
- #include <algorithm>
- #include <cstring>
-+#include <stdio.h>
- 
- #include "zlib.h"
- 

SOURCES/teckit-2.5.9-Correct-indentation.patch

@@ -0,0 +1,49 @@
+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
+

SOURCES/teckit-2.5.9.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEFdQbwC64B9QF7/r2yRg76gKIze4FAlyPuMIACgkQyRg76gKI
+ze7pMA/+OepQ5+74OFxXQXy5koIxvNXOEHmXkDHOHQPNDqbjmhTzJ3wfZdAfVz6L
+20qqFUoOdhfIQmcyp7VsMIbf/fN1OtYmQWHdsYZ6DnIgABBfDy/1ZVGI6h+uUMfv
+E2R39+4YCdO0xGA61OMYLWkM79VVyl5gsqcs8NB4eZ2JeoL1JlA2gtvOWc6pU2bn
+YaiP60LQfSYViWxeSKJVTwNKL+io9csNBJ++4L0/Ah13b7EvsILmslZUJ030mLxJ
+BghyGT0ondqQUfcfA7ZkypDJZLHn5jCvinISnC/BClgAahjfMyGlFgQbyjAYJ0nd
++2Dou0tugEyAoOwmq/bOAroHH1c2TVPoFyTXez0ls11JPCAyhJc+H0yIdugEmJQV
+qsL2vVwT+RSDDp0wgjjXIQTTM8do9pifNRHbvjk6Y39OuljGVlZ/LqMRuqgSa9hm
+t+ulHBhsc1VFPjj28j7HNzJvBtf1FfCNqZub0kb/6/A313/ZrCwBAqMw1ztt8uCz
+48qUHDNYqORLHhX0mLJ870nmRCs2IN0BRbGbkM0n/260gwk2XOoqcmioEmgwXXsp
+rN2gc+v5nkVSX0NNhpsMKPGptx2q3BAlmATlxjmDt5Ib3cnanz8QcDQ63n4j7oiD
+k0qihHSVIL/D04NKkmxyMYV0cTcpH41S5jrCT71I6SsYj8SF/qw=
+=X9We
+-----END PGP SIGNATURE-----

SPECS/teckit.spec

@@ -1,73 +1,126 @@
 Name:           teckit
-Version:        2.5.8
+Version:        2.5.9
-Release:        1%{?dist}
+Release:        8%{?dist}
 Summary:        Conversion library and mapping compiler
-License:        LGPLv2+ or CPL
+# COPYING:                      links to license/LICENSING.txt
-Group:          Development/Libraries
+# license/License_CPLv05.txt:   CPLv0.5 text
-URL:            http://scripts.sil.org/teckit
+# license/License_LGPLv21.txt:  LGPLv2 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
+## 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
+# 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
+## 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
 Source0:        https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz
-BuildRequires:  expat-devel zlib-devel libtool
+Source1:        https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz.asc
-Patch0:         TECkit_2_5_1-includes.patch
+# 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:  coreutils
+BuildRequires:  expat-devel
+# gcc is not needed, the only source/NormalizationData.c is included into
+# a C++ source/Engine.cpp compilation unit.
+BuildRequires:  gcc-c++
+BuildRequires:  gnupg2
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  zlib-devel
+# Tests:
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+Provides:       bundels(graphite2)
 
 %description
-TECkit is a low-level toolkit intended to be used by other
+TECkit is a low-level toolkit intended to be used by other applications that
-applications that need to perform encoding conversions (e.g., when
+need to perform encoding conversions (e.g., when importing legacy data into
-importing legacy data into a Unicode-based application). The
+a Unicode-based application). The primary component of the TECkit package is
-primary component of the TECkit package is therefore a library that
+therefore a library that performs conversions; this is the "TECkit engine".
-performs conversions; this is the "TECkit engine". The engine
+The engine relies on mapping tables in a specific binary format (for which
-relies on mapping tables in a specific binary format (for which
+documentation is available); there is a compiler that creates such tables from
-documentation is available); there is a compiler that creates such
+a human-readable mapping description (a simple text file).
-tables from a human-readable mapping description (a simple text file).
 
 %package devel
-Summary:        Conversion library and mapping compiler
+Summary:        Developmental files for TECkit library
-Group:          Development/Libraries
+License:        LGPLv2+ or CPL
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-TECkit is a low-level toolkit intended to be used by other
+Header files, pkg-config module, and documentation for developing application
-applications that need to perform encoding conversions (e.g., when
+that use TECkit, a character encoding and mapping, library.
-importing legacy data into a Unicode-based application). The
-primary component of the TECkit package is therefore a library that
-performs conversions; this is the "TECkit engine". The engine
-relies on mapping tables in a specific binary format (for which
-documentation is available); there is a compiler that creates such
-tables from a human-readable mapping description (a simple text file).
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
-%patch0 -p1 -b .includes
+%patch0 -p1
-
+# Remove bundled libraries
-%{__rm} -r zlib*
+rm -r zlib-*/*.c SFconv/expat
+# Regenerate build script
+autoreconf -fi
 
 %build
-%configure --disable-static
+%configure \
-make %{_smp_mflags}
+    --disable-debug \
+    --disable-final \
+    --without-old-lib-names \
+    --disable-profile \
+    --disable-profilefn \
+    --enable-shared \
+    --disable-static \
+    --with-system-zlib \
+    --disable-tetex-build
+%{make_build}
 
 %install
-make install DESTDIR=%{buildroot}
+%{make_install}
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %check
-make check
+%{make_build} check
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
 
 %files
-%license COPYING
+# COPYING is unhelpful
-%doc AUTHORS INSTALL NEWS README
+%license license/*
-%license license/{LICENSING.txt,License_CPLv05.txt,License_LGPLv21.txt}
+# ChangeLog is unhelpful
+%doc AUTHORS NEWS README
 %{_bindir}/sfconv
 %{_bindir}/teckit_compile
 %{_bindir}/txtconv
-%{_libdir}/libTECkit.so.*
+%{_libdir}/libTECkit.so.0
-%{_libdir}/libTECkit_Compiler.so.*
+%{_libdir}/libTECkit.so.0.*
+%{_libdir}/libTECkit_Compiler.so.0
+%{_libdir}/libTECkit_Compiler.so.0.*
 %{_mandir}/man1/*
 
 %files devel
@@ -78,11 +131,42 @@ make check
 %{_libdir}/pkgconfig/teckit.pc
 
 %changelog
-* Thu Aug 09 2018 Than Ngo <than@redhat.com> - 2.5.8-1
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.9-8
-- Related: #1578798, update to 2.5.8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.9-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Aug 12 2019 Petr Pisar <ppisar@redhat.com> - 2.5.9-2
+- Modernize spec file
+- License corrected to
+  ((LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1))
+
+* Sat Aug 10 2019 Tom Callaway <spot@fedoraproject.org> - 2.5.9-1
+- update to 2.5.9
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Tue May 22 2018 Than Ngo <than@redhat.com> - 2.5.7-3
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-3
-- Resolves: #1578798, Fix FTBFS
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild