8 changed files with 238 additions and 87 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,27 @@
-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.92.0.tar.gz
+/libfprint-v1.94.0.tar.gz
+/libfprint-v1.94.1.tar.gz
+/libfprint-v1.94.2.tar.gz
+/libfprint-v1.94.3.tar.gz
+/libfprint-v1.94.4.tar.gz
+/libfprint-v1.94.5.tar.gz
+/libfprint-v1.94.6.tar.gz
+/libfprint-v1.94.8.tar.gz
+/libfprint-v1.94.9.tar.gz
--- a/.libfprint.metadata
+++ b/.libfprint.metadata
@ -1 +0,0 @@
-1980a7ba38bb2f4fa1f5b79f52f2d613ea923681 SOURCES/libfprint-v1.90.7.tar.gz
--- a/SPECS/libfprint.spec
+++ b/SPECS/libfprint.spec
@ -1,115 +1,94 @@
-Name:           libfprint
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.94.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-Version:        1.90.7
-Release:        1%{?dist}
-Summary:        Toolkit for fingerprint scanner
+* Wed Nov 03 2021 Benjamin Berg <bberg@redhat.com> - 1.94.2-1
+- Update to 1.94.2 (#1977842)

-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
+* Fri Sep 24 2021 Benjamin Berg <bberg@redhat.com> - 1.94.1-1
+- Update to 1.94.1

-BuildRequires:  rpm-build
-BuildRequires:  meson
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  git
-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
-BuildRequires:  cairo-devel
-BuildRequires:  python3-cairo python3-gobject
-#BuildRequires:  umockdev
+* Fri Aug 20 2021 Benjamin Berg <bberg@redhat.com> - 1.94.0-1
+- Update to 1.94.0 (#1977842)
+  Related: #1894694

-%description
-libfprint offers support for consumer fingerprint reader devices.
+* Mon Jul 26 2021 Benjamin Berg <bberg@redhat.com> - 1.92.0-3
+- Add patch disabling timeouts in virtual-device to enable fedora CI
+- Increase timeout of tests by factor 4

-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.92.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

+* Thu Jul 01 2021 Benjamin Berg <bberg@redhat.com> - 1.92.0-1
+- Update to 1.92.0 (#1977842)

-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-%prep
-%autosetup -S git -n libfprint-v%{version}
+* Wed Jan 13 13:33:12 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.90.7-1
+- Update to 1.90.7 (#1902256)

-%build
-# Include the virtual image driver for integration tests
-%meson -Dx11-examples=false -Ddrivers=all
-%meson_build
+* Wed Dec 09 2020 Benjamin Berg <bberg@redhat.com> - 1.90.6-1
+- New upstream release 1.90.6 (#1902256)

-%install
-%meson_install
+* Tue Dec 01 2020 Benjamin Berg <bberg@redhat.com> - 1.90.5-1
+- New upstream release 1.90.5 (#1902256)

-%ldconfig_scriptlets
+* Fri Nov 27 2020 Benjamin Berg <bberg@redhat.com> - 1.90.4-1
+- New upstream release 1.90.4 (#1902256)
+  Resolves #1889384

-%check
-%meson_test
+* Mon Sep 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.3-1
+- Update to libfprint 1.90.3 (#1878746)

-%files
-%license COPYING
-%doc NEWS TODO THANKS AUTHORS README
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/*.typelib
-%{_udevrulesdir}/60-libfprint-2-autosuspend.rules
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

-%files devel
-%doc HACKING.md
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}-2.pc
-%{_datadir}/gir-1.0/*.gir
-%{_datadir}/gtk-doc/html/libfprint-2/
+* 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

-%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
+* Fri Feb 14 2020 Bastien Nocera <bnocera@redhat.com> - 1.90.1-2
+ libfprint-1.90.1-2
+- Rebuilt for F32

-* Mon Dec 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.6-1
- New upstream release 1.90.6
-  Related: #1888181
+* Mon Feb 10 2020 Benjamin Berg <bberg@redhat.com> - 1.90.1-1
+- Update to libfprint 1.90.1

-* Tue Dec 08 2020 Benjamin Berg <bberg@redhat.com> - 1.90.5-2
- New upstream release 1.90.5
-  Related: #1888181
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-* Mon Jan 20 2020 Benjamin Berg <bberg@redhat.com> - 1.90.0-4
- Add patch to fix unit-test failure
+* Wed Aug 14 2019 Benjamin Berg <bberg@redhat.com> - 1.0-1
+ libfprint-1.0-1
+- Update to 1.0

-* 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
+* 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 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
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

-* 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 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
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: dist.depcheck}
--- a/libfprint.spec
+++ b/libfprint.spec
@ -0,0 +1,77 @@
+Name:           libfprint
+
+Version:        1.94.9
+Release:        %autorelease
+Summary:        Toolkit for fingerprint scanner
+
+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
+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; 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}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%autosetup -S git -n libfprint-v%{version}
+
+%build
+# Include the virtual image driver for integration tests
+%meson -Ddrivers=all -Dinstalled-tests=false
+%meson_build
+
+%install
+%meson_install
+
+%ldconfig_scriptlets
+
+%check
+%meson_test -t 4
+
+%files
+%license COPYING
+%doc NEWS THANKS AUTHORS README.md
+%{_libdir}/*.so.*
+%{_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
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}-2.pc
+%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gtk-doc/html/libfprint-2/
+
+%changelog
+%autochangelog
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (libfprint-v1.94.9.tar.gz) = f8debcc1277e6112ed450c04a40cf6113afd7b38377b3fd259bedb1f553b29db758f3519491940bf9cd4ade0f8e70b68040d5bef4c8dbf5f7c2afc1802086397
--- a/tests/run-umockdev.sh
+++ b/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
--- a/tests/tests.yml
+++ b/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
+
				`@ -1 +0,0 @@`
				`1980a7ba38bb2f4fa1f5b79f52f2d613ea923681 SOURCES/libfprint-v1.90.7.tar.gz`
				`@ -0,0 +1 @@`
				`SHA512 (libfprint-v1.94.9.tar.gz) = f8debcc1277e6112ed450c04a40cf6113afd7b38377b3fd259bedb1f553b29db758f3519491940bf9cd4ade0f8e70b68040d5bef4c8dbf5f7c2afc1802086397`