.gitignore

@@ -1 +1,20 @@
-SOURCES/libfprint-v1.90.7.tar.gz
+libfprint-0.1.0-pre2.tar.bz2
+libfprint-0.3.0.tar.bz2
+/libfprint-0.4.0.tar.bz2
+/libfprint-0.5.0.tar.xz
+/libfprint-0.5.1.tar.xz
+/libfprint-0.6.0.tar.xz
+/libfprint-0.7.0.tar.xz
+/libfprint-0.8.1.tar.xz
+/libfprint-0.8.2.tar.xz
+/libfprint-1.0.tar.xz
+/libfprint-v1.90.1.tar.gz
+/libfprint-v1.90.2.tar.gz
+/libfprint-v1.90.3.tar.gz
+/libfprint-v1.90.4.tar.gz
+/libfprint-v1.90.5.tar.gz
+/libfprint-v1.90.6.tar.gz
+/libfprint-v1.90.7.tar.gz
+/libfprint-v1.94.0.tar.gz
+/libfprint-v1.94.5.tar.gz
+/libfprint-v1.94.6.tar.gz

.libfprint.metadata

@@ -1 +1 @@
-1980a7ba38bb2f4fa1f5b79f52f2d613ea923681 SOURCES/libfprint-v1.90.7.tar.gz
+12c0acadeb4ef4120a0af12a24e53e8e0e0aa0de libfprint-v1.94.6.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

libfprint.spec

@@ -1,16 +1,14 @@
 Name:           libfprint
 
-Version:        1.90.7
+Version:        1.94.6
 Release:        1%{?dist}
 Summary:        Toolkit for fingerprint scanner
 
-Group:          System Environment/Libraries
 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:  rpm-build
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -21,23 +19,22 @@ BuildRequires:  pkgconfig(gusb) >= 0.3.0
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  gtk-doc
+BuildRequires:  libgudev-devel
 # For the udev.pc to install the rules
 BuildRequires:  systemd
 BuildRequires:  gobject-introspection-devel
-# For internal CI tests
-BuildRequires:  cairo-devel
-BuildRequires:  python3-cairo python3-gobject
-#BuildRequires:  umockdev
+# For internal CI tests; umockdev 0.13.2 has an important locking fix
+BuildRequires:  python3-cairo python3-gobject cairo-devel
+BuildRequires:  umockdev >= 0.13.2
+
 
 %description
 libfprint offers support for consumer fingerprint reader devices.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -47,7 +44,7 @@ developing applications that use %{name}.
 
 %build
 # Include the virtual image driver for integration tests
-%meson -Dx11-examples=false -Ddrivers=all
+%meson -Dgtk-examples=false -Ddrivers=all -Dudev_hwdb=disabled -Dinstalled-tests=false
 %meson_build
 
 %install
@@ -56,14 +53,14 @@ developing applications that use %{name}.
 %ldconfig_scriptlets
 
 %check
-%meson_test
+%meson_test -t 4
 
 %files
 %license COPYING
-%doc NEWS TODO THANKS AUTHORS README
+%doc NEWS THANKS AUTHORS README.md
 %{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/*.typelib
-%{_udevrulesdir}/60-libfprint-2-autosuspend.rules
+%{_udevrulesdir}/70-libfprint-2.rules
 
 %files devel
 %doc HACKING.md
@@ -74,42 +71,101 @@ developing applications that use %{name}.
 %{_datadir}/gtk-doc/html/libfprint-2/
 
 %changelog
-* Wed Jan 20 14:11:30 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.90.7-1
-- New upstream release 1.90.7
-  Related: #1888181
+* Mon Jan 29 2024 Kate Hsuan <hpa@redhat.com> - 1.94.6-1
+- Update to 1.94.6
+  Resolves: RHEL-19611
 
-* Mon Dec 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.6-1
-- New upstream release 1.90.6
-  Related: #1888181
+* Mon Dec 19 2022 Bastien Nocera <bnocera@redhat.com> - 1.94.5-1
+- Update to 1.94.5
+Resolves: rhbz#2148088
 
-* Tue Dec 08 2020 Benjamin Berg <bberg@redhat.com> - 1.90.5-2
-- New upstream release 1.90.5
-  Related: #1888181
+* Wed Aug 25 2021 Benjamin Berg <bberg@redhat.com> - 1.94.0-3
+- Rebuilt with gating test fix for skipped tests
+  Related: #1981216
 
-* Mon Jan 20 2020 Benjamin Berg <bberg@redhat.com> - 1.90.0-4
-- Add patch to fix unit-test failure
+* Wed Aug 25 2021 Benjamin Berg <bberg@redhat.com> - 1.94.0-2
+- Rebuilt for gating
+  Related: #1981216
 
-* Wed Jan 15 2020 Benjamin Berg <bberg@redhat.com> - 1.90.0-3
-- Pull in upstream fixes from the not-yet released 1.90.1
-- Related: rhbz1791256
+* Mon Aug 23 2021 Benjamin Berg <bberg@redhat.com> - 1.94.0-1
+- Update to 1.94.0
+  Resolves: #1981216
 
-* Fri Nov 22 2019 Benjamin Berg <bberg@redhat.com> - 1.90.0-2
-- Add patch to remove debug spew from udev rules
-- Add patch to fix compilation error
-- Related: rhbz1740752
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.90.7-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed Oct 09 2019 Benjamin Berg <bberg@redhat.com> - 1.90.0-1
-+ libfprint-1.90.0-1
-- Update to 1.90.0
-- Resolves: rhbz1740752
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.90.7-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 13:33:12 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.90.7-1
+- Update to 1.90.7 (#1902256)
+
+* Wed Dec 09 2020 Benjamin Berg <bberg@redhat.com> - 1.90.6-1
+- New upstream release 1.90.6 (#1902256)
+
+* Tue Dec 01 2020 Benjamin Berg <bberg@redhat.com> - 1.90.5-1
+- New upstream release 1.90.5 (#1902256)
+
+* Fri Nov 27 2020 Benjamin Berg <bberg@redhat.com> - 1.90.4-1
+- New upstream release 1.90.4 (#1902256)
+  Resolves #1889384
+
+* Mon Sep 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.3-1
+- Update to libfprint 1.90.3 (#1878746)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 08 2020 Benjamin Berg <bberg@redhat.com> - 1.90.2-1
+- Update to libfprint 1.90.2
+- Resolves #1832229
+- Resolves #1841834
+- Resolves #1841965
+
+* Fri Feb 14 2020 Bastien Nocera <bnocera@redhat.com> - 1.90.1-2
++ libfprint-1.90.1-2
+- Rebuilt for F32
+
+* Mon Feb 10 2020 Benjamin Berg <bberg@redhat.com> - 1.90.1-1
+- Update to libfprint 1.90.1
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Aug 14 2019 Benjamin Berg <bberg@redhat.com> - 1.0-1
++ libfprint-1.0-1
+- Update to 1.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 20 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.2-2
++ libfprint-0.8.2-2
+- Fix build with newer meson (#1604585)
 
 * Tue Jul 17 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.2-1
 + libfprint-0.8.2-1
 - Update to 0.8.2
+- Add required gcc and gcc-c++ BR
 
-* Fri Jun 15 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.1-1
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 12 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.1-1
 + libfprint-0.8.1-1
-- Update to 0.8.1
+- Update to 0.8.1 to fix the build
+
+* Tue Jun 12 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.0-1
++ libfprint-0.8.0-1
+- Update to 0.8.0
+- Port to meson, gtk-doc
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

sources

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

tests/run-umockdev.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/bash
+set -u
+
+# Switch into the tests directory
+cd source/tests || exit 1
+
+# check if we need to install additional packages
+# which is the case if we are on RHEL 8
+source /etc/os-release || exit 1
+
+if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then
+    dnf config-manager -y --add-repo umockdev.repo
+    dnf install -y umockdev-devel python3-gobject-base
+    pip3 install python-dbusmock
+fi
+
+# Each directory in source/tests is a umockdev based test
+# discover them
+declare -a TESTS=()
+for f in *; do
+    test -d $f && TESTS+=( "$f" )
+done
+
+export FP_DEVICE_EMULATION=1
+
+# execute all the tests, one by one
+RESULT=0
+for test in ${TESTS[@]}; do
+    echo "$test"
+    ./umockdev-test.py "$test"
+    RES=$?
+    echo "$test finished with return code $RES"
+    echo ""
+    # Ignore skipped tests
+    if [ $RES -ne 0 -a $RES -ne 77 ]; then
+        RESULT=1
+    fi
+done
+
+exit $RESULT

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
+