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 d1ab039..79469cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /libdatrie-0.2.8.tar.xz /libdatrie-0.2.9.tar.xz /libdatrie-0.2.13.tar.xz -/libdatrie-0.2.14.tar.xz diff --git a/libdatrie.spec b/libdatrie.spec index b975150..8b632e9 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,6 +1,6 @@ Name: libdatrie -Version: 0.2.14 -Release: 1%{?dist} +Version: 0.2.13 +Release: 7%{?dist} Summary: Implementation of Double-Array structure for representing trie License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie @@ -62,25 +62,6 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check %{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog -* Fri Nov 28 2025 Peng Wu - 0.2.14-1 -- Update to 0.2.14 -- Resolves: RHBZ#2416998 - -* Thu Jul 24 2025 Fedora Release Engineering - 0.2.13-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.2.13-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.2.13-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.2.13-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.2.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Thu Jul 20 2023 Fedora Release Engineering - 0.2.13-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_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 a14cd76..5c0f034 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdatrie-0.2.14.tar.xz) = c5df387a1c9b5fae65eff69102651f4f054d873194d97faa8e329282353156fa4fb41a1ea771b24ade3f0ad2a548d85d7950a4aa6ed4e5c356bc504720e792d1 +SHA512 (libdatrie-0.2.13.tar.xz) = db3c879d825ead5871c12ef3a06bb093cb1708a6e7e20775eaf82356af9dd6ad54c6b5cabbe1773f2494d3dfa2426528fdd49441038b6294b70ccb1a3d90099a diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index fa9a675..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,14 +0,0 @@ -test: ./runtest.sh -duration: 50m -framework: beakerlib -require: - - make - - gcc - - autoconf - - autoconf-archive - - automake - - libtool - - doxygen - - libdatrie - - gnome-common - - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh new file mode 100644 index 0000000..00f8111 --- /dev/null +++ b/tests/make_check.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -x + +check_return_value () { + if [ $1 != 0 ] ; then + exit $1 + fi +} + +cd $1 +autoreconf -f -i -v +./configure --prefix=/usr +check_return_value $? +make +check_return_value $? +make check +exit $? diff --git a/tests/runtest.sh b/tests/runtest.sh deleted file mode 100755 index 3d4a741..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - rlPhaseStartSetup - rlShowPackageVersion libdatrie - rlRun -t -l "VERSION=$(rpm -q libdatrie --queryformat='%{version}')" 0 "Get VERSION" - FEDORA_VERSION=$(rlGetDistroRelease) - rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" - rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" - rlRun "pushd $tmp" - rlFetchSrcForInstalled "libdatrie" - rlRun "rpm --define '_topdir $tmp' -i *src.rpm" - rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" - rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" - if [ -d BUILD/libdatrie-${VERSION}-build ]; then - rlRun -t -l "pushd BUILD/libdatrie-${VERSION}-build/libdatrie-${VERSION}" - else - rlRun -t -l "pushd BUILD/libdatrie-${VERSION}" - fi - rlPhaseEnd - - rlPhaseStartTest - rlRun "set -o pipefail" - rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" - rlRun -t -l "./configure" - rlRun -t -l "make" - rlRun -t -l "make check" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd; 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..68a065c --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,21 @@ +- hosts: localhost + vars: + - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" + tags: + - classic + remote_user: root + roles: + - role: standard-test-source # to get the source tar ball to do “make check” + - role: standard-test-basic + required_packages: + - make + - gcc + - autoconf + - autoconf-archive + - automake + - libtool + - doxygen + tests: + - make-check: + dir: ./ + run: bash ./make_check.sh ./source