diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 0cbc784..c70ebd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ /liblangtag-0.6.4.tar.bz2 -/liblangtag-0.6.6.tar.bz2 -/liblangtag-0.6.7.tar.bz2 diff --git a/0001-ro-MD-ro-to-get-make-check-to-succeed.patch b/0001-ro-MD-ro-to-get-make-check-to-succeed.patch new file mode 100644 index 0000000..2e64634 --- /dev/null +++ b/0001-ro-MD-ro-to-get-make-check-to-succeed.patch @@ -0,0 +1,25 @@ +From f46641f735e8a22d4c2a2002d0b6b90ff7a664b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 30 Jun 2022 10:19:18 +0100 +Subject: [PATCH] ro-MD -> ro to get make check to succeed + +--- + tests/check-tag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/check-tag.c b/tests/check-tag.c +index 99466e2..29e738b 100644 +--- a/tests/check-tag.c ++++ b/tests/check-tag.c +@@ -197,7 +197,7 @@ TDEF (lt_tag_canonicalize) { + fail_unless(lt_tag_parse(t1, "mo", NULL), "should be valid langtag."); + s = lt_tag_canonicalize(t1, NULL); + fail_unless(s != NULL, "Unable to be canonicalize."); +- fail_unless(lt_strcmp0(s, "ro-MD") == 0, "Unexpected result to be canonicalized."); ++ fail_unless(lt_strcmp0(s, "ro") == 0, "Unexpected result to be canonicalized."); + free(s); + + lt_tag_unref(t1); +-- +2.36.1 + diff --git a/liblangtag.spec b/liblangtag.spec index 1e258ba..2deff40 100644 --- a/liblangtag.spec +++ b/liblangtag.spec @@ -4,14 +4,15 @@ %global soversion_gobject 0 Name: liblangtag -Version: 0.6.7 -Release: 6%{?dist} +Version: 0.6.4 +Release: 2%{?dist} Summary: An interface library to access tags for identifying languages -License: LGPL-3.0-or-later OR MPL-2.0 -URL: https://bitbucket.org/tagoh/liblangtag/ +License: LGPLv3+ or MPLv2.0 +URL: http://tagoh.bitbucket.org/liblangtag/ Source0: https://bitbucket.org/tagoh/%{name}/downloads/%{name}-%{version}.tar.bz2 Patch0: liblangtag-noparallel-gir.patch +Patch1: 0001-ro-MD-ro-to-get-make-check-to-succeed.patch Requires: %{name}-data = %{version}-%{release} @@ -47,7 +48,7 @@ Features: %package data Summary: %{name} data files -License: Unicode-DFS-2015 +License: Unicode BuildArch: noarch %description data @@ -134,34 +135,6 @@ export LD_LIBRARY_PATH=`pwd`/liblangtag/.libs:`pwd`/liblangtag-gobject/.libs${LD %{_datadir}/gtk-doc/html/%{name} %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.6.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.6.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.6.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.6.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.6.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 1 2023 Akira TAGOH - 0.6.7-1 -- New upstream release. - Resolves: rhbz#2251364 - -* Thu Jul 20 2023 Fedora Release Engineering - 0.6.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Eike Rathke - 0.6.4-4 -- Migrated to SPDX license IDs - -* Thu Jan 19 2023 Fedora Release Engineering - 0.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Thu Jul 21 2022 Fedora Release Engineering - 0.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/plans/basic.fmf b/plans/basic.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/basic.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 8039d41..fcd0463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (liblangtag-0.6.7.tar.bz2) = 3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68 +SHA512 (liblangtag-0.6.4.tar.bz2) = 6c6dd3e6b0fc8d6f10cafd74112cbaf2a2342a88a908ad2f7ae759b3f5fb0cf6d788504c1de072e9ef019f2f5a284daeb2d2393036b6b402c5bc87f32b55f271 diff --git a/tests/test.py b/tests/basic/test.py similarity index 100% rename from tests/test.py rename to tests/basic/test.py diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index b6b1bef..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Basic test -require: - - liblangtag-gobject - - python3 - - python3-gobject -test: ./runtest.sh -framework: beakerlib diff --git a/tests/runtest.sh b/tests/runtest.sh deleted file mode 100755 index d80a05b..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 -t -s "python3 $basedir/test.py" 0 "Check liblangtag" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $tmp" 0 "Remove tmp directory" - rlPhaseEnd -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..2980de6 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + become: yes + tags: + - classic + roles: + - role: standard-test-basic + required_packages: + - liblangtag-gobject + - python3 + tests: + - basic: + run: python3 ./test.py