From d4b024a5def050733ed3b956fbc48a2cc6b91d81 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Tue, 8 Oct 2019 15:57:47 +0200
Subject: [PATCH] Update to 1.90.1

---
 .gitignore            |  1 +
 gating.yaml           |  6 ++++++
 libfprint.spec        | 35 +++++++++++++++++++++++++----------
 sources               |  2 +-
 tests/run-umockdev.sh | 37 +++++++++++++++++++++++++++++++++++++
 tests/tests.yml       | 21 +++++++++++++++++++++
 6 files changed, 91 insertions(+), 11 deletions(-)
 create mode 100644 gating.yaml
 create mode 100755 tests/run-umockdev.sh
 create mode 100644 tests/tests.yml

diff --git a/.gitignore b/.gitignore
index 30697c9..0073a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ libfprint-0.3.0.tar.bz2
 /libfprint-0.8.1.tar.xz
 /libfprint-0.8.2.tar.xz
 /libfprint-1.0.tar.xz
+/libfprint-v1.90.1.tar.gz
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..d71584a
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: dist.depcheck}
diff --git a/libfprint.spec b/libfprint.spec
index 7ad5b27..d182cee 100644
--- a/libfprint.spec
+++ b/libfprint.spec
@@ -1,24 +1,30 @@
 Name:           libfprint
-Version:        1.0
-Release:        2%{?dist}
+
+Version:        1.90.1
+Release:        1%{?dist}
 Summary:        Toolkit for fingerprint scanner
 
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/fprint/libfprint
-Source0:        https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz
+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:  pkgconfig(glib-2.0) >= 2.28
-BuildRequires:  pkgconfig(libusb-1.0) >= 0.9.1
+BuildRequires:  pkgconfig(glib-2.0) >= 2.50
+BuildRequires:  pkgconfig(gio-2.0) >= 2.44.0
+BuildRequires:  pkgconfig(gusb) >= 0.3.0
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  gtk-doc
 # For the udev.pc to install the rules
 BuildRequires:  systemd
+BuildRequires:  gobject-introspection-devel
+# 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.
@@ -32,10 +38,11 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -S git
+%autosetup -S git -n libfprint-v%{version}
 
 %build
-%meson -Dx11-examples=false
+# Include the virtual image driver for integration tests
+%meson -Dx11-examples=false -Ddrivers=all
 %meson_build
 
 %install
@@ -43,20 +50,28 @@ developing applications that use %{name}.
 
 %ldconfig_scriptlets
 
+%check
+%meson_test
+
 %files
 %license COPYING
 %doc NEWS TODO THANKS AUTHORS README
 %{_libdir}/*.so.*
-%{_udevrulesdir}/60-fprint-autosuspend.rules
+%{_libdir}/girepository-1.0/*.typelib
+%{_udevrulesdir}/60-libfprint-2-autosuspend.rules
 
 %files devel
 %doc HACKING.md
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
-%{_datadir}/gtk-doc/html/libfprint/
+%{_libdir}/pkgconfig/%{name}-2.pc
+%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gtk-doc/html/libfprint-2/
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 7b11a8a..0774fe7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libfprint-1.0.tar.xz) = 6a38a691d1f2d5fe19b5bbda9b77321d2e34f1a3aa8b61f38109e0095b28e156cdd7be5ade8f3db8ff26045f8556b68e938b3e1378f4b6d84a2106566e7fdb53
+SHA512 (libfprint-v1.90.1.tar.gz) = 0548d29e55aaa59e73f0fd13cac6b85dd3a048358c365423e12884c3877c3e30422ee3fc4d18a3daba2f26383fb886f1d40a74dba5d947f7bdec6b8852995b4e
diff --git a/tests/run-umockdev.sh b/tests/run-umockdev.sh
new file mode 100755
index 0000000..073f811
--- /dev/null
+++ b/tests/run-umockdev.sh
@@ -0,0 +1,37 @@
+#!/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 ""
+    ((RESULT += $RES))
+done
+
+exit $RESULT
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..7ee3761
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,21 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+  - 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
+