Compare commits

...

No commits in common. "c8" and "imports/c8-beta/libfprint-1.90.0-2.el8" have entirely different histories.

5 changed files with 74 additions and 32 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libfprint-v1.90.7.tar.gz
SOURCES/libfprint-1.90.0.tar.xz

View File

@ -1 +1 @@
1980a7ba38bb2f4fa1f5b79f52f2d613ea923681 SOURCES/libfprint-v1.90.7.tar.gz
fdd9097da91c66cfe4875fdf15e7f4d3ea30e5c7 SOURCES/libfprint-1.90.0.tar.xz

View File

@ -0,0 +1,26 @@
From 7a4dd9640668a258383e8e14ce5ae230d33927e0 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
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

View File

@ -0,0 +1,29 @@
From ce2478c89f21811029097c6bc06455ca69d42214 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
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

View File

@ -1,13 +1,14 @@
Name: libfprint
Version: 1.90.7
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/-/archive/v%{version}/libfprint-v%{version}.tar.gz
Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/%{name}-%{version}.tar.xz
ExcludeArch: s390 s390x
BuildRequires: rpm-build
@ -17,7 +18,7 @@ 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: libgusb-devel >= 0.3.0
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(pixman-1)
BuildRequires: gtk-doc
@ -25,10 +26,12 @@ BuildRequires: gtk-doc
BuildRequires: systemd
BuildRequires: gobject-introspection-devel
# For internal CI tests
BuildRequires: cairo-devel
BuildRequires: python3-cairo python3-gobject
#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.
@ -42,8 +45,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -S git -n libfprint-v%{version}
%autosetup -p1
%build
# Include the virtual image driver for integration tests
@ -55,44 +59,27 @@ developing applications that use %{name}.
%ldconfig_scriptlets
# Disabled as umockdev is not available
%check
%meson_test
exit 0
#%meson_test
%files
%license COPYING
%doc NEWS TODO THANKS AUTHORS README
%{_libdir}/*.so.*
%{_libdir}/girepository-1.0/*.typelib
%{_udevrulesdir}/60-libfprint-2-autosuspend.rules
%{_udevrulesdir}/60-fprint-autosuspend.rules
%files devel
%doc HACKING.md
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}-2.pc
%{_libdir}/pkgconfig/%{name}2.pc
%{_datadir}/gir-1.0/*.gir
%{_datadir}/gtk-doc/html/libfprint-2/
%{_datadir}/gtk-doc/html/libfprint/
%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 Dec 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.6-1
- New upstream release 1.90.6
Related: #1888181
* Tue Dec 08 2020 Benjamin Berg <bberg@redhat.com> - 1.90.5-2
- New upstream release 1.90.5
Related: #1888181
* Mon Jan 20 2020 Benjamin Berg <bberg@redhat.com> - 1.90.0-4
- Add patch to fix unit-test failure
* 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
* 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