From c58214c194258bf0ccc6d7d00eadef630f798d08 Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Fri, 13 Jan 2023 09:53:14 +0300 Subject: [PATCH 01/11] Update to 0.0.8. --- uchardet.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 3ec82c4..de3fafd 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,11 +1,11 @@ %undefine __cmake_in_source_build Name: uchardet -Version: 0.0.6 -Release: 16%{?dist} +Version: 0.0.8 +Release: 1%{?dist} Summary: An encoding detector library ported from Mozilla -License: MPLv1.1 or GPLv2+ or LGPLv2+ +License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later URL: https://www.freedesktop.org/wiki/Software/%{name} Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz @@ -54,17 +54,21 @@ popd %files %license COPYING -%doc AUTHORS +%doc AUTHORS README.md %{_bindir}/%{name} %{_libdir}/lib%{name}.so.* %{_mandir}/man1/%{name}.1* %files devel %{_includedir}/%{name}/ +%{_libdir}/cmake/%{name} %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 13 2023 Vasiliy N. Glazov - 0.0.8-1 +- Update to 0.0.8 + * Sat Jul 23 2022 Fedora Release Engineering - 0.0.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3639c4bd17ab80bcb29d87c024cea83a5272609b Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Fri, 13 Jan 2023 09:54:57 +0300 Subject: [PATCH 02/11] Add sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3a6a00d..eba3f84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /uchardet-0.0.5.tar.gz /uchardet-0.0.6.tar.xz +/uchardet-0.0.8.tar.xz diff --git a/sources b/sources index ddefc4b..115fc9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uchardet-0.0.6.tar.xz) = eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 +SHA512 (uchardet-0.0.8.tar.xz) = 4a5dcc9ff021352f3b252e103ff1475cec62c974294b264ee9243f024633c3ae44be8c7733608624066113e635f8b156ecb08c8ff87c736d04b07641eb166382 From 13c5df53cdd55791af360c115c58e1803a122e98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:39:13 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index de3fafd..d5daf99 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 13 2023 Vasiliy N. Glazov - 0.0.8-1 - Update to 0.0.8 From 35b4fc72dfb01a5fadddc69b5bfb5e81c03fb6c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:57:57 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index d5daf99..12aa2ef 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 09f719ba3da5c41053759515486321227f1be386 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 28 Jul 2023 20:30:00 +0900 Subject: [PATCH 05/11] Correct License tag for SPDX migration. --- uchardet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 12aa2ef..9c25ee7 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,10 +2,10 @@ Name: uchardet Version: 0.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An encoding detector library ported from Mozilla -License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later +License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later URL: https://www.freedesktop.org/wiki/Software/%{name} Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 28 2023 Akira TAGOH - 0.0.8-4 +- Correct License tag for SPDX migration. + * Sat Jul 22 2023 Fedora Release Engineering - 0.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4034b693749b8efde5b9eef4aa807aa516b51d8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:57:08 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 9c25ee7..6167b37 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 28 2023 Akira TAGOH - 0.0.8-4 - Correct License tag for SPDX migration. From db4f4dcda6c4b93b8cfe616640c5f9189ace603b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:06:32 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 6167b37..59ccaa7 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.0.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e3a513ece9a05177dc37574c78f2bd109fc15432 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 19 Jul 2024 19:18:44 +0900 Subject: [PATCH 08/11] ci: Use tmt based test cases --- .fmf/version | 1 + plans/basic.fmf | 5 +++++ tests/basic/main.fmf | 5 +++++ tests/basic/test.sh | 26 ++++++++++++++++++++++++++ tests/basic/utf8.txt | 2 ++ 5 files changed, 39 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/basic/main.fmf create mode 100755 tests/basic/test.sh create mode 100644 tests/basic/utf8.txt 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/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf new file mode 100644 index 0000000..d5f22b4 --- /dev/null +++ b/tests/basic/main.fmf @@ -0,0 +1,5 @@ +summary: Concise summary describing what the test does +require: + - uchardet +test: ./test.sh +framework: beakerlib diff --git a/tests/basic/test.sh b/tests/basic/test.sh new file mode 100755 index 0000000..d413821 --- /dev/null +++ b/tests/basic/test.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k + +basedir=$(pwd) + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlRun "set -o pipefail" + rlPhaseEnd + + rlPhaseStartTest + rlRun "uchardet $basedir/test.sh | tee output" 0 "Check uchardet" + rlAssertGrep "ASCII" "output" + rlRun "uchardet $basedir/utf8.txt | tee output" 0 "Check uchardet" + rlAssertGrep "UTF-8" "output" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/basic/utf8.txt b/tests/basic/utf8.txt new file mode 100644 index 0000000..dc07c19 --- /dev/null +++ b/tests/basic/utf8.txt @@ -0,0 +1,2 @@ +日本語 + From 2dd7d5ff0ebf53edaf76b938db7841c9583dd6f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:34:57 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 59ccaa7..119ba9f 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.0.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1de6fcbbc384b7f71f0e2a430ba6c93ff06ef131 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:41:51 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uchardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 119ba9f..5a2b2a5 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -66,6 +66,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.0.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.0.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ff7290a359c129beb0da87a1184480e509e61e8e Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 11 Nov 2025 14:35:22 +0100 Subject: [PATCH 11/11] Allow to build with CMake 4.0 (rhbz#2381619) --- uchardet.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/uchardet.spec b/uchardet.spec index 5a2b2a5..c709ca2 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -2,7 +2,7 @@ Name: uchardet Version: 0.0.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An encoding detector library ported from Mozilla License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -32,6 +32,8 @@ for developing tools for uchardet. %autosetup %build +# TODO: Please submit an issue to upstream (rhbz#2381619) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DBUILD_STATIC=OFF @@ -66,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Nov 11 2025 Cristian Le - 0.0.8-9 +- Allow to build with CMake 4.0 (rhbz#2381619) + * Fri Jul 25 2025 Fedora Release Engineering - 0.0.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild