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 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/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/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 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 @@ +日本語 + diff --git a/uchardet.spec b/uchardet.spec index 3ec82c4..c709ca2 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: 9%{?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 @@ -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 @@ -54,17 +56,45 @@ 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 +* 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 + +* 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 + +* 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. + +* 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 + +* 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