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/.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/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/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 22ab360..d67dc82 100644 --- a/teckit.spec +++ b/teckit.spec @@ -1,17 +1,18 @@ Name: teckit -Version: 2.5.11 -Release: 1%{?dist} -Summary: Conversion library and mapping compiler +Version: 2.5.12 +Release: 5%{?dist} +Summary: Encoding 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 -# 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: LGPL-2.1-or-later OR CPL-0.5-or-later +# 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 # # source/TECkit_Format.h: LGPL-2.1-or-later OR CPL-0.5-or-later ## Not in any binary package @@ -40,11 +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 -# -# 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 +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 @@ -77,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} @@ -90,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 @@ -126,26 +122,54 @@ 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 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 + +* 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 + +* 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 + * Mon Feb 20 2023 Petr Pisar - 2.5.11-1 - 2.5.11 bump -* Mon Feb 20 2023 Petr Pisar - 2.5.9-10 +* 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-9 +* 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 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.5.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.5.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild 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