From f36967b8b0f22a2003af4015c705ae5bf1a97ac4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 22:17:17 +0000 Subject: import libfprint-1.90.0-2.el8 --- diff --git a/.gitignore b/.gitignore index 7ea8091..a56f74f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libfprint-0.8.2.tar.xz +SOURCES/libfprint-1.90.0.tar.xz diff --git a/.libfprint.metadata b/.libfprint.metadata index c7070e7..21f565e 100644 --- a/.libfprint.metadata +++ b/.libfprint.metadata @@ -1 +1 @@ -c209f0c033ada641eec215cc96d11c30f233359d SOURCES/libfprint-0.8.2.tar.xz +fdd9097da91c66cfe4875fdf15e7f4d3ea30e5c7 SOURCES/libfprint-1.90.0.tar.xz diff --git a/SOURCES/0001-udev-rules-Remove-debug-spew-from-udev-rules.patch b/SOURCES/0001-udev-rules-Remove-debug-spew-from-udev-rules.patch new file mode 100644 index 0000000..54a831f --- /dev/null +++ b/SOURCES/0001-udev-rules-Remove-debug-spew-from-udev-rules.patch @@ -0,0 +1,26 @@ +From 7a4dd9640668a258383e8e14ce5ae230d33927e0 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Fri, 22 Nov 2019 17:07:56 +0100 +Subject: [PATCH] udev-rules: Remove debug spew from udev rules + +Some debug output was ending up inside the udev rules. Remove it again. +--- + libfprint/fprint-list-udev-rules.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c +index 0c1b059..c0a3337 100644 +--- a/libfprint/fprint-list-udev-rules.c ++++ b/libfprint/fprint-list-udev-rules.c +@@ -99,8 +99,6 @@ main (int argc, char **argv) + g_autoptr(GArray) drivers = g_array_new (FALSE, FALSE, sizeof (GType)); + guint i; + +- g_print ("%p\n", drivers); +- g_print ("%p\n", fpi_get_driver_types); + fpi_get_driver_types (drivers); + + printed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); +-- +2.23.0 + diff --git a/SOURCES/0002-Fix-missing-initialization.patch b/SOURCES/0002-Fix-missing-initialization.patch new file mode 100644 index 0000000..87ea899 --- /dev/null +++ b/SOURCES/0002-Fix-missing-initialization.patch @@ -0,0 +1,29 @@ +From ce2478c89f21811029097c6bc06455ca69d42214 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Fri, 22 Nov 2019 17:31:29 +0100 +Subject: [PATCH 2/2] Fix missing initialization + +Seems like the compiler on ppc64 will sometimes report this as a missing +initialization. Technically this is not true, as the variable will +always be initialized before the scope is left. But, lets make the +compiler happy about this. +--- + examples/verify.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/verify.c b/examples/verify.c +index 89a9b2c..4e1c988 100644 +--- a/examples/verify.c ++++ b/examples/verify.c +@@ -182,7 +182,7 @@ start_verification (FpDevice *dev, VerifyData *verify_data) + { + g_print ("Loading previously enrolled %s finger data...\n", + finger_to_string (verify_data->finger)); +- g_autoptr(FpPrint) verify_print; ++ g_autoptr(FpPrint) verify_print = NULL; + + verify_print = print_data_load (dev, verify_data->finger); + +-- +2.23.0 + diff --git a/SPECS/libfprint.spec b/SPECS/libfprint.spec index ab9b0eb..ebcb769 100644 --- a/SPECS/libfprint.spec +++ b/SPECS/libfprint.spec @@ -1,18 +1,36 @@ Name: libfprint -Version: 0.8.2 -Release: 1%{?dist} + +Version: 1.90.0 +Release: 2%{?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/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x -BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel +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: libgusb-devel >= 0.3.0 +BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: gtk-doc # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: gtk-doc meson +BuildRequires: gobject-introspection-devel +# For internal CI tests +#BuildRequires: python3-cairo python3-gobject +#BuildRequires: umockdev + +Patch0001: 0001-udev-rules-Remove-debug-spew-from-udev-rules.patch +Patch0002: 0002-Fix-missing-initialization.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -29,10 +47,11 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build -%meson -Dx11-examples=false +# Include the virtual image driver for integration tests +%meson -Dx11-examples=false -Ddrivers=all %meson_build %install @@ -40,20 +59,37 @@ developing applications that use %{name}. %ldconfig_scriptlets +# Disabled as umockdev is not available +%check +exit 0 +#%meson_test + %files %license COPYING %doc NEWS TODO THANKS AUTHORS README %{_libdir}/*.so.* +%{_libdir}/girepository-1.0/*.typelib %{_udevrulesdir}/60-fprint-autosuspend.rules %files devel %doc HACKING.md %{_includedir}/* %{_libdir}/*.so -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}2.pc +%{_datadir}/gir-1.0/*.gir %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Fri Nov 22 2019 Benjamin Berg - 1.90.0-2 +- Add patch to remove debug spew from udev rules +- Add patch to fix compilation error +- Related: rhbz1740752 + +* Wed Oct 09 2019 Benjamin Berg - 1.90.0-1 ++ libfprint-1.90.0-1 +- Update to 1.90.0 +- Resolves: rhbz1740752 + * Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 + libfprint-0.8.2-1 - Update to 0.8.2