Update to 1.94.6

Resolves: #2250624

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -23,6 +23,3 @@ libfprint-0.3.0.tar.bz2
 /libfprint-v1.94.4.tar.gz
 /libfprint-v1.94.5.tar.gz
 /libfprint-v1.94.6.tar.gz
-/libfprint-v1.94.7.tar.gz
-/libfprint-v1.94.8.tar.gz
-/libfprint-v1.94.9.tar.gz

libfprint.spec

@@ -1,19 +1,18 @@
 Name:           libfprint
 
-Version:        1.94.9
+Version:        1.94.6
 Release:        %autorelease
 Summary:        Toolkit for fingerprint scanner
 
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        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
 BuildRequires:  gcc-c++
 BuildRequires:  git
-BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig(glib-2.0) >= 2.50
 BuildRequires:  pkgconfig(gio-2.0) >= 2.44.0
 BuildRequires:  pkgconfig(gusb) >= 0.3.0
@@ -39,20 +38,12 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        tests
-Summary:        Tests for the %{name} package
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description tests
-The %{name}-tests package contains tests that can be used to verify
-the functionality of the installed %{name} package.
-
 %prep
 %autosetup -S git -n libfprint-v%{version}
 
 %build
 # Include the virtual image driver for integration tests
-%meson -Ddrivers=all
+%meson -Ddrivers=all -Dinstalled-tests=false
 %meson_build
 
 %install
@@ -60,8 +51,8 @@ the functionality of the installed %{name} package.
 
 %ldconfig_scriptlets
 
-# TODO: The test can't run with the recent pygobject3.52.
-# So, skip the test until the issue of pygobject is fixed.
+%check
+%meson_test -t 4
 
 %files
 %license COPYING
@@ -70,7 +61,6 @@ the functionality of the installed %{name} package.
 %{_libdir}/girepository-1.0/*.typelib
 %{_udevhwdbdir}/60-autosuspend-libfprint-2.hwdb
 %{_udevrulesdir}/70-libfprint-2.rules
-%{_datadir}/metainfo/org.freedesktop.libfprint.metainfo.xml
 
 %files devel
 %doc HACKING.md
@@ -80,9 +70,5 @@ the functionality of the installed %{name} package.
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gtk-doc/html/libfprint-2/
 
-%files tests
-%{_libexecdir}/installed-tests/libfprint-2/
-%{_datadir}/installed-tests/libfprint-2/
-
 %changelog
 %autochangelog

plans/integration.fmf

@@ -1,5 +0,0 @@
-summary: Test for libfprint
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (libfprint-v1.94.9.tar.gz) = f8debcc1277e6112ed450c04a40cf6113afd7b38377b3fd259bedb1f553b29db758f3519491940bf9cd4ade0f8e70b68040d5bef4c8dbf5f7c2afc1802086397
+SHA512 (libfprint-v1.94.6.tar.gz) = 99cfce5828d7df771bfc1fd92ad357b76c265bc96443af3398c415d2bb54a931fa3018811c59ceb62b43ef416b430db4acf324aa1dca4f374eaef1f1595a154a

tests/integration/main.fmf

@@ -1,11 +0,0 @@
-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

tests/run-umockdev.sh

@@ -2,7 +2,7 @@
 set -u
 
 # Switch into the tests directory
-cd /usr/share/installed-tests/libfprint-2 || exit 1
+cd source/tests || 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 /usr/share/installed-tests/libfprint-2 is a umockdev based test
+# Each directory in source/tests 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"
-    /usr/libexec/installed-tests/libfprint-2/umockdev-test.py "$test"
+    ./umockdev-test.py "$test"
     RES=$?
     echo "$test finished with return code $RES"
     echo ""

tests/tests.yml

@@ -0,0 +1,23 @@
+---
+- 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
+