Skip to content

Commit f007c35

Browse files
archana25-msarchana25-ms
authored
Upgrade: teckit version to 2.5.12 (#11880)
1 parent 559a55f commit f007c35

7 files changed

Lines changed: 115 additions & 114 deletions

‎SPECS-EXTENDED/teckit/gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg‎

2.21 KB
Binary file not shown.

‎SPECS-EXTENDED/teckit/teckit-2.5.12.tar.gz.asc‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQIzBAABCgAdFiEEFdQbwC64B9QF7/r2yRg76gKIze4FAmTpBKoACgkQyRg76gKI
4+
ze77JA//cnsdOvju13TzAoGuVk5TEULO1QS/dqDHIHkl8J90nIwnb4CjIwNhpXbG
5+
6Fyh8cNObv8JiF+FgH+/cDgVgWm0+YZ263hNrIFxdfi9jofojFQJXcyZKSYFvHo0
6+
/tC3ZHmR3syU/upjfYJZc1jFliNVXPQBJWaLBCsPiFzwXwc9BNAH/87UiLLoz4C4
7+
OLLDG4qQtuqnrMK5veAn+4O+BZx8v01qV4hRRwcPR4msjEGlVbx/iD7OU0FWYtgj
8+
6cDS0Y6QkLlVz3M3Szf7C8f5Pn03RwJq++bBG4UL2fNxDoSBZ3/gWfrVzaRJ8BIG
9+
QhkaGGOmIdGAktC9dMXProymDr5dssKrqFKAMpufLv17H67yFjynnZ8V9V/21fMr
10+
OKiVcFloJXAqTW+iS41DmN1+2U4W+vPT/vPEx6MU3NmLzYEBwUZSBuIzIxoqes7B
11+
h6Edrc1GS72fp6g3q4m+HDBscgZ24rDR5t/IKO41CF7rnFY2YRKsoXYPd4n+T31m
12+
wfDacyqqS5O86CuLrv+YIm1t0XonAsW2PWpXjpA2pt+9lr++kaX8PRXVPPhflLfe
13+
2DKHQ2Kb5dZqos9d3pFX16lh2BZhS08Xrla6a33TuWHmJM5GSVs3vTYuBFmJ831S
14+
MIgo4eauwGg07BOt/FJWYiVZUU4Mmf7qDZvf8I5mXnAY9qpMwB8=
15+
=XwY5
16+
-----END PGP SIGNATURE-----

‎SPECS-EXTENDED/teckit/teckit-2.5.9-Correct-indentation.patch‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎SPECS-EXTENDED/teckit/teckit-2.5.9.tar.gz.asc‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎SPECS-EXTENDED/teckit/teckit.signatures.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg": "f5329aaf18398e5ac3d0ec5e6fd81df69d34bec52a83986ada164b899e74dcf8",
4-
"teckit-2.5.9.tar.gz": "6823fb3142efa34e5d74de35d37cdf4724efbf577f5ff15a8e2b364e6ef47d3d",
5-
"teckit-2.5.9.tar.gz.asc": "a03de624364644e776d2b407209f8ba4d549a4abf66b88c67cbf5eeaec8552d6"
4+
"teckit-2.5.12.tar.gz": "7ef10e5bb79ea6437b7a06b4a92b314d3f142292758288efce50e12a455b6e7f",
5+
"teckit-2.5.12.tar.gz.asc": "1f101179662f1c26f717ff5a1042bb0c1d9b709fd9334858bff4bd5e2b52a542"
66
}
7-
}
7+
}

‎SPECS-EXTENDED/teckit/teckit.spec‎

Lines changed: 94 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Name: teckit
4-
Version: 2.5.9
4+
Version: 2.5.12
55
Release: 4%{?dist}
6-
Summary: Conversion library and mapping compiler
6+
Summary: Encoding conversion library and mapping compiler
77
# COPYING: links to license/LICENSING.txt
8-
# license/License_CPLv05.txt: CPLv0.5 text
9-
# license/License_LGPLv21.txt: LGPLv2 text
8+
# license/License_CPLv05.txt: CPL-1.0 text, "0.5" version in the license
9+
# title is irrelevant
10+
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
11+
# license/License_LGPLv21.txt: LGPL-2.1 text
1012
# license/LICENSING.txt: license declarations
11-
# SFconv/UtfCodec.cpp: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
12-
# SFconv/UtfCodec.h: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
13-
# <https://github.com/silnrsi/graphite/issues/58>,
14-
# graphite2 package uses "MPL"
15-
# source/Engine.cpp: LGPLv2+ or CPL
16-
# source/TECkit_Format.h: LGPLv2+ or CPL
13+
# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
14+
# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 (bundled Graphite2)
15+
# MPL version clarified at <https://github.com/silnrsi/graphite/issues/58>,
16+
# source/Engine.cpp: LGPL-2.1-or-later OR CPL-1.0, CPL-1.0 identifier already
17+
# encompases "or later" choice
18+
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
19+
# source/TECkit_Format.h: LGPL-2.1-or-later OR CPL-0.5-or-later
1720
## Not in any binary package
1821
# aclocal.m4: FSFULLR
19-
# compile: GPLv2+ with exceptions
20-
# config.guess: GPLv3+ with exceptions
21-
# config.sub: GPLv3+ with exceptions
22-
# configure: FSFUL and GPLv2+ with exceptions
23-
# depcomp: GPLv2+ with exceptions
24-
# install-sh: MIT
25-
# lib/Makefile.in: FSFULLR
26-
# ltmain.sh: GPLv2+ with exceptions and GPLv3+ with exceptions and GPLv3+
27-
# m4/libtool.m4: FSFULL and FSFULLR and GPLv2+ with exceptions
22+
# compile: GPL-2.0-or-later WITH Autoconf-exception-generic
23+
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>
24+
# config.guess: GPL-3.0-or-later WITH Autoconf-exception-generic
25+
# config.sub: GPL-3.0-or-later WITH Autoconf-exception-generic
26+
# configure: FSFUL AND GPL-2.0-or-later WITH Libtool-exception
27+
# depcomp: GPL-2.0-or-later WITH Autoconf-exception-generic
28+
# install-sh: X11
29+
# lib/Makefile.in: FSFULLRWD
30+
# ltmain.sh: GPL-2.0-or-later WITH Libtool-exception AND
31+
# GPL-3.0-or-later WITH Libtool-exception AND GPL-3.0-or-later
32+
# m4/libtool.m4: FSFULL AND FSFULLR AND GPL-2.0-or-later WITH Libtool-exception
2833
# m4/ltoptions.m4: FSFULLR
2934
# m4/ltsugar.m4: FSFULLR
3035
# m4/ltversion.m4: FSFULLR
3136
# m4/lt~obsolete.m4: FSFULLR
32-
# Makefile.in: FSFULLR
33-
# missing: GPLv2+ with exceptions
34-
# test-driver: GPLv2+ with exceptions
35-
# test/Makefile.in: FSFULLR
37+
# Makefile.in: FSFULLRWD
38+
# missing: GPL-2.0-or-later WITH Autoconf-exception-generic
39+
# test-driver: GPL-2.0-or-later WITH Autoconf-exception-generic
40+
# test/Makefile.in: FSFULLRWD
3641
## Unbundled
37-
# SFconv/expat/xmlparse/hashtable.c: MPLv1.1 of GPL+ (bundled expat)
38-
# SFconv/expat/xmlparse/xmlparse.c: MPLv1.1 of GPL+ (bundled expat)
39-
# zlib-1.2.3: zlib (see nonexistent zlib.h, reported to
40-
# <https://github.com/silnrsi/teckit/issues/22>)
41-
License: (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1)
42-
URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit
42+
# SFconv/expat/xmlparse/hashtable.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
43+
# SFconv/expat/xmlparse/xmlparse.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
44+
# zlib-1.2.3: "sse copyright notice in zlib.h"
45+
# zlib-1.2.3/zlib.h: zlib-acknowledgement
46+
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)
47+
URL: https://software.sil.org/teckit/
4348
Source0: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz
4449
Source1: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz.asc
4550
# Exported from ppisar's keyring
4651
Source2: gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
47-
# Fix a compiler warning about a misindentation,
48-
# <https://github.com/silnrsi/teckit/pull/23>
49-
Patch0: teckit-2.5.9-Correct-indentation.patch
50-
BuildRequires: autoconf
51-
BuildRequires: automake
52+
BuildRequires: autoconf >= 2.54
53+
BuildRequires: automake >= 1.11
5254
BuildRequires: coreutils
5355
BuildRequires: expat-devel
5456
# gcc is not needed, the only source/NormalizationData.c is included into
@@ -75,7 +77,7 @@ a human-readable mapping description (a simple text file).
7577

7678
%package devel
7779
Summary: Developmental files for TECkit library
78-
License: LGPLv2+ or CPL
80+
License: LGPL-2.1-or-later OR CPL-1.0
7981
Requires: %{name}%{?_isa} = %{version}-%{release}
8082

8183
%description devel
@@ -84,14 +86,13 @@ that use TECkit, a character encoding and mapping, library.
8486

8587
%prep
8688
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
87-
%setup -q
88-
%patch 0 -p1
89+
%autosetup -p1
8990
# Remove bundled libraries
90-
rm -r zlib-*/*.c SFconv/expat
91-
# Regenerate build script
92-
autoreconf -fi
91+
rm -r zlib-*/*.{c,h} SFconv/expat
9392

9493
%build
94+
# Regenerate a build script
95+
autoreconf -fi
9596
%configure \
9697
--disable-debug \
9798
--disable-final \
@@ -123,18 +124,67 @@ rm -f %{buildroot}%{_libdir}/*.la
123124
%{_libdir}/libTECkit.so.0.*
124125
%{_libdir}/libTECkit_Compiler.so.0
125126
%{_libdir}/libTECkit_Compiler.so.0.*
126-
%{_mandir}/man1/*
127+
%{_mandir}/man1/sfconv.*
128+
%{_mandir}/man1/teckit_compile.*
129+
%{_mandir}/man1/txtconv.*
127130

128131
%files devel
129132
%doc docs/*.pdf
130-
%{_includedir}/teckit/
133+
%{_includedir}/teckit
131134
%{_libdir}/libTECkit.so
132135
%{_libdir}/libTECkit_Compiler.so
133136
%{_libdir}/pkgconfig/teckit.pc
134137

135138
%changelog
136-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.5.9-4
137-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
139+
* Mon Jan 13 2025 Archana Shettigar <v-shettigara@microsoft.com> - 2.5.12-4
140+
- Initial Azure Linux import from Fedora 41 (license: MIT).
141+
- License verified
142+
143+
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-3
144+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
145+
146+
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-2
147+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
148+
149+
* Mon Aug 28 2023 Petr Pisar <ppisar@redhat.com> - 2.5.12-1
150+
- 2.5.12 bump
151+
- Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
152+
(LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0)"
153+
154+
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.11-2
155+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
156+
157+
* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.11-1
158+
- 2.5.11 bump
159+
160+
* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.9-12
161+
- Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
162+
(LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)"
163+
164+
* Sat Feb 18 2023 Than Ngo <than@redhat.com> - 2.5.9-11
165+
- migrated to SPDX license
166+
167+
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-10
168+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
169+
170+
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-9
171+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
172+
173+
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-8
174+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
175+
176+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-7
177+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
178+
179+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-6
180+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
181+
182+
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-5
183+
- Second attempt - Rebuilt for
184+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
185+
186+
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-4
187+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
138188

139189
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-3
140190
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28826,8 +28826,8 @@
2882628826
"type": "other",
2882728827
"other": {
2882828828
"name": "teckit",
28829-
"version": "2.5.9",
28830-
"downloadUrl": "https://github.com/silnrsi/teckit/releases/download/v2.5.9/teckit-2.5.9.tar.gz"
28829+
"version": "2.5.12",
28830+
"downloadUrl": "https://github.com/silnrsi/teckit/releases/download/v2.5.12/teckit-2.5.12.tar.gz"
2883128831
}
2883228832
}
2883328833
},

0 commit comments

Comments
 (0)