rpms
/
teckit
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:i10cs
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

6 changed files with 105 additions and 115 deletions
Show Stats

2
.gitignore vendored
Unescape View File

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

2
.teckit.metadata
Unescape View File

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

16
SOURCES/teckit-2.5.12.tar.gz.asc
Unescape View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEFdQbwC64B9QF7/r2yRg76gKIze4FAmTpBKoACgkQyRg76gKI
ze77JA//cnsdOvju13TzAoGuVk5TEULO1QS/dqDHIHkl8J90nIwnb4CjIwNhpXbG
6Fyh8cNObv8JiF+FgH+/cDgVgWm0+YZ263hNrIFxdfi9jofojFQJXcyZKSYFvHo0
/tC3ZHmR3syU/upjfYJZc1jFliNVXPQBJWaLBCsPiFzwXwc9BNAH/87UiLLoz4C4
OLLDG4qQtuqnrMK5veAn+4O+BZx8v01qV4hRRwcPR4msjEGlVbx/iD7OU0FWYtgj
6cDS0Y6QkLlVz3M3Szf7C8f5Pn03RwJq++bBG4UL2fNxDoSBZ3/gWfrVzaRJ8BIG
QhkaGGOmIdGAktC9dMXProymDr5dssKrqFKAMpufLv17H67yFjynnZ8V9V/21fMr
OKiVcFloJXAqTW+iS41DmN1+2U4W+vPT/vPEx6MU3NmLzYEBwUZSBuIzIxoqes7B
h6Edrc1GS72fp6g3q4m+HDBscgZ24rDR5t/IKO41CF7rnFY2YRKsoXYPd4n+T31m
wfDacyqqS5O86CuLrv+YIm1t0XonAsW2PWpXjpA2pt+9lr++kaX8PRXVPPhflLfe
2DKHQ2Kb5dZqos9d3pFX16lh2BZhS08Xrla6a33TuWHmJM5GSVs3vTYuBFmJ831S
MIgo4eauwGg07BOt/FJWYiVZUU4Mmf7qDZvf8I5mXnAY9qpMwB8=
=XwY5
-----END PGP SIGNATURE-----

49
SOURCES/teckit-2.5.9-Correct-indentation.patch
Unescape View File

@ -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

16
SOURCES/teckit-2.5.9.tar.gz.asc
Unescape View File

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

135
SPECS/teckit.spec
Unescape View File

@ -1,52 +1,54 @@
Name: teckit Name: teckit
Version: 2.5.9 Version: 2.5.12
Release: 8%{?dist} Release: 4%{?dist}
Summary: Conversion library and mapping compiler Summary: Encoding conversion library and mapping compiler
# COPYING: links to license/LICENSING.txt # COPYING: links to license/LICENSING.txt
# license/License_CPLv05.txt: CPLv0.5 text # license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license
# license/License_LGPLv21.txt: LGPLv2 text # 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 # license/LICENSING.txt: license declarations
# SFconv/UtfCodec.cpp: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2) # SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
# SFconv/UtfCodec.h: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2) # SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
# <https://github.com/silnrsi/graphite/issues/58>, # MPL version clarified at <https://github.com/silnrsi/graphite/issues/58>,
# graphite2 package uses "MPL" # source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already
# source/Engine.cpp: LGPLv2+ or CPL # encompases "or later" choice
# source/TECkit_Format.h: LGPLv2+ or CPL # <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 ## Not in any binary package
# aclocal.m4: FSFULLR # aclocal.m4: FSFULLR
# compile: GPLv2+ with exceptions # compile: GPL-2.0-or-later WITH Autoconf-exception-generic
# config.guess: GPLv3+ with exceptions # <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>
# config.sub: GPLv3+ with exceptions # config.guess: GPL-3.0-or-later WITH Autoconf-exception-generic
# configure: FSFUL and GPLv2+ with exceptions # config.sub: GPL-3.0-or-later WITH Autoconf-exception-generic
# depcomp: GPLv2+ with exceptions # configure: FSFUL AND GPL-2.0-or-later WITH Libtool-exception
# install-sh: MIT # depcomp: GPL-2.0-or-later WITH Autoconf-exception-generic
# lib/Makefile.in: FSFULLR # install-sh: X11
# ltmain.sh: GPLv2+ with exceptions and GPLv3+ with exceptions and GPLv3+ # lib/Makefile.in: FSFULLRWD
# m4/libtool.m4: FSFULL and FSFULLR and GPLv2+ with exceptions # 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/ltoptions.m4: FSFULLR
# m4/ltsugar.m4: FSFULLR # m4/ltsugar.m4: FSFULLR
# m4/ltversion.m4: FSFULLR # m4/ltversion.m4: FSFULLR
# m4/lt~obsolete.m4: FSFULLR # m4/lt~obsolete.m4: FSFULLR
# Makefile.in: FSFULLR # Makefile.in: FSFULLRWD
# missing: GPLv2+ with exceptions # missing: GPL-2.0-or-later WITH Autoconf-exception-generic
# test-driver: GPLv2+ with exceptions # test-driver: GPL-2.0-or-later WITH Autoconf-exception-generic
# test/Makefile.in: FSFULLR # test/Makefile.in: FSFULLRWD
## Unbundled ## Unbundled
# SFconv/expat/xmlparse/hashtable.c: MPLv1.1 of GPL+ (bundled expat) # SFconv/expat/xmlparse/hashtable.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
# SFconv/expat/xmlparse/xmlparse.c: MPLv1.1 of GPL+ (bundled expat) # SFconv/expat/xmlparse/xmlparse.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
# zlib-1.2.3: zlib (see nonexistent zlib.h, reported to # zlib-1.2.3: "sse copyright notice in zlib.h"
# <https://github.com/silnrsi/teckit/issues/22>) # zlib-1.2.3/zlib.h: zlib-acknowledgement
License: (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1) 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://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit URL: https://software.sil.org/teckit/
Source0: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz 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 Source1: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz.asc
# Exported from ppisar's keyring # Exported from ppisar's keyring
Source2: gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg Source2: gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
# Fix a compiler warning about a misindentation, BuildRequires: autoconf >= 2.54
# <https://github.com/silnrsi/teckit/pull/23> BuildRequires: automake >= 1.11
Patch0: teckit-2.5.9-Correct-indentation.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: expat-devel BuildRequires: expat-devel
# gcc is not needed, the only source/NormalizationData.c is included into # 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 %package devel
Summary: Developmental files for TECkit library 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} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -82,14 +84,13 @@ that use TECkit, a character encoding and mapping, library.
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q %autosetup -p1
%patch0 -p1
# Remove bundled libraries # Remove bundled libraries
rm -r zlib-*/*.c SFconv/expat rm -r zlib-*/*.{c,h} SFconv/expat
# Regenerate build script
autoreconf -fi
%build %build
# Regenerate a build script
autoreconf -fi
%configure \ %configure \
--disable-debug \ --disable-debug \
--disable-final \ --disable-final \
@ -121,22 +122,60 @@ rm -f %{buildroot}%{_libdir}/*.la
%{_libdir}/libTECkit.so.0.* %{_libdir}/libTECkit.so.0.*
%{_libdir}/libTECkit_Compiler.so.0 %{_libdir}/libTECkit_Compiler.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 %files devel
%doc docs/*.pdf %doc docs/*.pdf
%{_includedir}/teckit/ %{_includedir}/teckit
%{_libdir}/libTECkit.so %{_libdir}/libTECkit.so
%{_libdir}/libTECkit_Compiler.so %{_libdir}/libTECkit_Compiler.so
%{_libdir}/pkgconfig/teckit.pc %{_libdir}/pkgconfig/teckit.pc
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.9-8 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.5.12-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Bump release for October 2024 mass rebuild:
Related: rhbz#1991688 Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.5.12-3
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.5.12-3
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* 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)"
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* 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-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
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.9-7 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-6 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Write Preview
Loading…
Cancel
Save