From 35bbfe0e0d8c3d36e37af4132f4651ba85e978b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:39:59 +0000 Subject: [PATCH 1/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5e7d505a691630caaf9081d0c88f0bbd3d65abe4 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 6 Aug 2025 15:38:48 +0800 Subject: [PATCH 2/4] Migrate to tmt test Resolves: #2382943 --- .fmf/version | 1 + plans/integration.fmf | 5 +++++ tests/integration/main.fmf | 11 +++++++++++ tests/{ => integration}/run-umockdev.sh | 6 +++--- tests/tests.yml | 23 ----------------------- 5 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/integration.fmf create mode 100644 tests/integration/main.fmf rename tests/{ => integration}/run-umockdev.sh (79%) delete mode 100644 tests/tests.yml 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/integration.fmf b/plans/integration.fmf new file mode 100644 index 0000000..05fe63a --- /dev/null +++ b/plans/integration.fmf @@ -0,0 +1,5 @@ +summary: Test for libfprint +discover: + how: fmf +execute: + how: tmt diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf new file mode 100644 index 0000000..df893f0 --- /dev/null +++ b/tests/integration/main.fmf @@ -0,0 +1,11 @@ +summary: Test for libfprint +require: + - cairo-devel + - libfprint-devel + - libfprint-tests + - umockdev-devel + - python3-cairo + - python3-gobject-base + - python3-pip + - python3-packaging +test: bash ./run-umockdev.sh diff --git a/tests/run-umockdev.sh b/tests/integration/run-umockdev.sh similarity index 79% rename from tests/run-umockdev.sh rename to tests/integration/run-umockdev.sh index d8c5362..1beeca1 100755 --- a/tests/run-umockdev.sh +++ b/tests/integration/run-umockdev.sh @@ -2,7 +2,7 @@ set -u # Switch into the tests directory -cd source/tests || exit 1 +cd /usr/share/installed-tests/libfprint-2 || exit 1 # check if we need to install additional packages # which is the case if we are on RHEL 8 @@ -14,7 +14,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then pip3 install python-dbusmock fi -# Each directory in source/tests is a umockdev based test +# Each directory in /usr/share/installed-tests/libfprint-2 is a umockdev based test # discover them declare -a TESTS=() for f in *; do @@ -27,7 +27,7 @@ export FP_DEVICE_EMULATION=1 RESULT=0 for test in ${TESTS[@]}; do echo "$test" - ./umockdev-test.py "$test" + /usr/libexec/installed-tests/libfprint-2/umockdev-test.py "$test" RES=$? echo "$test finished with return code $RES" echo "" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index ab999c2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - always - required_packages: - - git - - role: standard-test-basic - tags: - - atomic - - classic - required_packages: - - python3-dbusmock - - umockdev - tests: - - virtual_image: - dir: . - run: source/tests/virtual-image.py - - umockdev: - dir: . - run: run-umockdev.sh - From 0585fee3e159ad7a5ab789ad424e3fde639591ca Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 6 Aug 2025 15:42:28 +0800 Subject: [PATCH 3/4] Skip the %check section due to recent pygobject issues libfprint is trying to resolve the test issue. It was found when the test runs with pygobject3.52 and python3.14. So, the %check was temporarily skipped to ensure the build can be run. Resolves: #2385111 --- libfprint.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index 07a5807..cae76f9 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -61,8 +61,8 @@ the functionality of the installed %{name} package. %ldconfig_scriptlets -%check -%meson_test -t 4 +# TODO: The test can't run with the recent pygobject3.52. +# So, skip the test until the issue of pygobject is fixed. %files %license COPYING From 65fc4cc2fbb662b0e1f03005b051d8dc3e998767 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Dec 2025 12:12:38 -0500 Subject: [PATCH 4/4] Drop ExcludeArch for IBM Z to allow building there for COSMIC --- libfprint.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index cae76f9..e4479c7 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -8,7 +8,6 @@ Summary: Toolkit for fingerprint scanner License: LicenseRef-Callaway-LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint Source0: https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v%{version}/libfprint-v%{version}.tar.gz -ExcludeArch: s390 s390x BuildRequires: meson BuildRequires: gcc