Skip to content

Commit

Permalink
Upgrade: teckit version to 2.5.12
Browse files Browse the repository at this point in the history
  • Loading branch information
archana25-ms committed Jan 13, 2025
1 parent be5bb3f commit 71961ee
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 114 deletions.
Binary file not shown.
16 changes: 16 additions & 0 deletions SPECS-EXTENDED/teckit/teckit-2.5.12.tar.gz.asc
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 49 deletions SPECS-EXTENDED/teckit/teckit-2.5.9-Correct-indentation.patch

This file was deleted.

16 changes: 0 additions & 16 deletions SPECS-EXTENDED/teckit/teckit-2.5.9.tar.gz.asc

This file was deleted.

6 changes: 3 additions & 3 deletions SPECS-EXTENDED/teckit/teckit.signatures.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Signatures": {
"gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg": "f5329aaf18398e5ac3d0ec5e6fd81df69d34bec52a83986ada164b899e74dcf8",
"teckit-2.5.9.tar.gz": "6823fb3142efa34e5d74de35d37cdf4724efbf577f5ff15a8e2b364e6ef47d3d",
"teckit-2.5.9.tar.gz.asc": "a03de624364644e776d2b407209f8ba4d549a4abf66b88c67cbf5eeaec8552d6"
"teckit-2.5.12.tar.gz": "7ef10e5bb79ea6437b7a06b4a92b314d3f142292758288efce50e12a455b6e7f",
"teckit-2.5.12.tar.gz.asc": "1f101179662f1c26f717ff5a1042bb0c1d9b709fd9334858bff4bd5e2b52a542"
}
}
}
138 changes: 94 additions & 44 deletions SPECS-EXTENDED/teckit/teckit.spec
Original file line number Diff line number Diff line change
@@ -1,54 +1,56 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux
Name: teckit
Version: 2.5.9
Version: 2.5.12
Release: 4%{?dist}
Summary: Conversion library and mapping compiler
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
Expand All @@ -75,7 +77,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
Expand All @@ -84,14 +86,13 @@ that use TECkit, a character encoding and mapping, library.

%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q
%patch 0 -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 \
Expand Down Expand Up @@ -123,18 +124,67 @@ 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
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 2.5.9-4
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
* Mon Jan 13 2025 Archana Shettigar <[email protected]> - 2.5.12-4
- Initial Azure Linux import from Fedora 41 (license: MIT).
- License Verified

* Sat Jul 20 2024 Fedora Release Engineering <[email protected]> - 2.5.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Sat Jan 27 2024 Fedora Release Engineering <[email protected]> - 2.5.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Mon Aug 28 2023 Petr Pisar <[email protected]> - 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 <[email protected]> - 2.5.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Mon Feb 20 2023 Petr Pisar <[email protected]> - 2.5.11-1
- 2.5.11 bump

* Mon Feb 20 2023 Petr Pisar <[email protected]> - 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 <[email protected]> - 2.5.9-11
- migrated to SPDX license

* Sat Jan 21 2023 Fedora Release Engineering <[email protected]> - 2.5.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Sat Jul 23 2022 Fedora Release Engineering <[email protected]> - 2.5.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Sat Jan 22 2022 Fedora Release Engineering <[email protected]> - 2.5.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Fri Jul 23 2021 Fedora Release Engineering <[email protected]> - 2.5.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Wed Jan 27 2021 Fedora Release Engineering <[email protected]> - 2.5.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

* Sat Aug 01 2020 Fedora Release Engineering <[email protected]> - 2.5.9-5
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Wed Jul 29 2020 Fedora Release Engineering <[email protected]> - 2.5.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Fri Jan 31 2020 Fedora Release Engineering <[email protected]> - 2.5.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -28546,8 +28546,8 @@
"type": "other",
"other": {
"name": "teckit",
"version": "2.5.9",
"downloadUrl": "https://github.com/silnrsi/teckit/releases/download/v2.5.9/teckit-2.5.9.tar.gz"
"version": "2.5.12",
"downloadUrl": "https://github.com/silnrsi/teckit/releases/download/v2.5.12/teckit-2.5.12.tar.gz"
}
}
},
Expand Down

0 comments on commit 71961ee

Please sign in to comment.