From c09ade4bda3f5e6b6067d4b5b7f6b36c68c4e798 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Jun 2018 16:06:40 +0200 Subject: [PATCH 01/59] + libfprint-0.8.0-1 Update to 0.8.0 Port to meson, gtk-doc --- libfprint.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index 6945b62..e448705 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,18 +1,18 @@ Name: libfprint -Version: 0.7.0 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint -Source0: http://freedesktop.org/~anarsoul/%{name}-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/b1242bedcf0d329ad2efe7ae29466ca2/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: doxygen autoconf automake libtool +BuildRequires: gtk-doc meson %description libfprint offers support for consumer fingerprint reader devices. @@ -32,16 +32,11 @@ developing applications that use %{name}. %setup -q %build -%configure --disable-silent-rules --disable-static -make %{?_smp_mflags} -pushd doc -make docs -popd +%meson -Dx11-examples=false +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %ldconfig_scriptlets @@ -58,6 +53,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jun 12 2018 Bastien Nocera - 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 - 0.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 88f092ba0f4577f37c4baf2e308091758f92ea89 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Jun 2018 16:12:13 +0200 Subject: [PATCH 02/59] + libfprint-0.8.1-1 Update to 0.8.1 to fix the build --- .gitignore | 1 + libfprint.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6b23df5..75c2b48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.5.1.tar.xz /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz +/libfprint-0.8.1.tar.xz diff --git a/libfprint.spec b/libfprint.spec index e448705..73c843c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,12 +1,12 @@ Name: libfprint -Version: 0.8.0 +Version: 0.8.1 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/uploads/b1242bedcf0d329ad2efe7ae29466ca2/%{name}-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel @@ -47,12 +47,17 @@ developing applications that use %{name}. %{_udevrulesdir}/60-fprint-autosuspend.rules %files devel -%doc HACKING doc/html +%doc HACKING.md %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Update to 0.8.1 to fix the build + * Tue Jun 12 2018 Bastien Nocera - 0.8.0-1 + libfprint-0.8.0-1 - Update to 0.8.0 diff --git a/sources b/sources index c7a739b..59dcb84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.7.0.tar.xz) = 7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16 +SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d From ff5ef5a699d7c75f15f1742fd2bfffae050aeebe Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Jun 2018 16:06:40 +0200 Subject: [PATCH 03/59] + libfprint-0.8.1-1 Port to meson, gtk-doc --- .gitignore | 1 + libfprint.spec | 26 +++++++++++++------------- sources | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6b23df5..75c2b48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.5.1.tar.xz /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz +/libfprint-0.8.1.tar.xz diff --git a/libfprint.spec b/libfprint.spec index 6945b62..b6544bf 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,18 +1,18 @@ Name: libfprint -Version: 0.7.0 -Release: 5%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint -Source0: http://freedesktop.org/~anarsoul/%{name}-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: doxygen autoconf automake libtool +BuildRequires: gtk-doc meson %description libfprint offers support for consumer fingerprint reader devices. @@ -32,16 +32,11 @@ developing applications that use %{name}. %setup -q %build -%configure --disable-silent-rules --disable-static -make %{?_smp_mflags} -pushd doc -make docs -popd +%meson -Dx11-examples=false +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %ldconfig_scriptlets @@ -52,12 +47,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_udevrulesdir}/60-fprint-autosuspend.rules %files devel -%doc HACKING doc/html +%doc HACKING.md %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Port to meson and gtk-doc + * Wed Feb 07 2018 Fedora Release Engineering - 0.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index c7a739b..59dcb84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.7.0.tar.xz) = 7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16 +SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d From 4adf231868072d18299cc951a9424c59a5fdb884 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:07:03 +0000 Subject: [PATCH 04/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 73c843c..26f2af0 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries @@ -54,6 +54,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 + libfprint-0.8.1-1 - Update to 0.8.1 to fix the build From ffbcab28db8171c63624679c52deac057f27116d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 15:26:02 +0200 Subject: [PATCH 05/59] + libfprint-0.8.2-1 Update to 0.8.2 --- .gitignore | 1 + libfprint.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75c2b48..49a41ac 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz /libfprint-0.8.1.tar.xz +/libfprint-0.8.2.tar.xz diff --git a/libfprint.spec b/libfprint.spec index b6544bf..3b8d962 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,5 +1,5 @@ Name: libfprint -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -54,6 +54,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 ++ libfprint-0.8.2-1 +- Update to 0.8.2 + * Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 + libfprint-0.8.1-1 - Port to meson and gtk-doc diff --git a/sources b/sources index 59dcb84..0549bb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d +SHA512 (libfprint-0.8.2.tar.xz) = 4f051bffd8f09a634031f44f1ef8b030cff4300a237a97b824a1894fd5db0e3b13548e0919d0256bfd62658216d37797bd4f4bad43382dd70f5de1aca934ba6d From 293cff04554892342333d4677907b1b98a0d38a3 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 15:26:02 +0200 Subject: [PATCH 06/59] + libfprint-0.8.2-1 Update to 0.8.2 --- .gitignore | 1 + libfprint.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75c2b48..49a41ac 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz /libfprint-0.8.1.tar.xz +/libfprint-0.8.2.tar.xz diff --git a/libfprint.spec b/libfprint.spec index 26f2af0..a11c3b9 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries @@ -54,6 +54,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 ++ libfprint-0.8.2-1 +- Update to 0.8.2 + * Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 59dcb84..0549bb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d +SHA512 (libfprint-0.8.2.tar.xz) = 4f051bffd8f09a634031f44f1ef8b030cff4300a237a97b824a1894fd5db0e3b13548e0919d0256bfd62658216d37797bd4f4bad43382dd70f5de1aca934ba6d From be6e9be420ce30aaafde31836875e61cbddd0091 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 18:33:39 +0200 Subject: [PATCH 07/59] Add missing GCC BR https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/UDI6KBUWJRMGEDI2DJQBS7MI2QVPRPW3/ --- libfprint.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index a11c3b9..69f2637 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -9,7 +9,7 @@ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x -BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel +BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel gcc # For the udev.pc to install the rules BuildRequires: systemd BuildRequires: gtk-doc meson @@ -57,6 +57,7 @@ developing applications that use %{name}. * Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 + libfprint-0.8.2-1 - Update to 0.8.2 +- Add required gcc BR * Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8b8445f62c1faad5816a15e768d910b0e05a10b9 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 18:50:05 +0200 Subject: [PATCH 08/59] Add C++ as well --- libfprint.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index 69f2637..cdb9629 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -9,7 +9,7 @@ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x -BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel gcc +BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel gcc gcc-c++ # For the udev.pc to install the rules BuildRequires: systemd BuildRequires: gtk-doc meson @@ -57,7 +57,7 @@ developing applications that use %{name}. * Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 + libfprint-0.8.2-1 - Update to 0.8.2 -- Add required gcc BR +- Add required gcc and gcc-c++ BR * Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From aad90071c904b03f30306df808c10dbaa8e0d5b9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 12:16:33 +0200 Subject: [PATCH 09/59] remove deprecated Group tag Signed-off-by: Igor Gnatenko --- libfprint.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index cdb9629..01d7baf 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -3,7 +3,6 @@ Version: 0.8.2 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/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz @@ -19,7 +18,6 @@ libfprint offers support for consumer fingerprint reader devices. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} From 32db904efb7154c2002f13ef096e128c888c0df4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 12:18:55 +0200 Subject: [PATCH 10/59] switch to proper pkgconfig() dependencies Signed-off-by: Igor Gnatenko --- libfprint.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index 01d7baf..7142908 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -8,10 +8,16 @@ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x -BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel gcc gcc-c++ +BuildRequires: meson +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(libusb-1.0) >= 0.9.1 +BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: gtk-doc # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: gtk-doc meson %description libfprint offers support for consumer fingerprint reader devices. @@ -20,12 +26,10 @@ libfprint offers support for consumer fingerprint reader devices. 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 %setup -q From fcc5f6308f4f2c68578b66340875821d07b34924 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 20 Jul 2018 12:38:48 +0200 Subject: [PATCH 11/59] + libfprint-0.8.2-2 Fix build with newer meson (#1604585) --- 0001-build-Fix-build-with-newer-meson.patch | 46 +++++++++++++++++++++ libfprint.spec | 11 ++++- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 0001-build-Fix-build-with-newer-meson.patch diff --git a/0001-build-Fix-build-with-newer-meson.patch b/0001-build-Fix-build-with-newer-meson.patch new file mode 100644 index 0000000..3295bca --- /dev/null +++ b/0001-build-Fix-build-with-newer-meson.patch @@ -0,0 +1,46 @@ +From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 20 Jul 2018 12:22:50 +0200 +Subject: [PATCH] build: Fix build with newer meson + +The gtk-doc meson helper regressed in that it didn't expect the +libfprint.types file to not exist, as earlier versions did. Remove +the --rebuild-types call so that it is not generated, and meson carries +on compiling the rest of the library. + +See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 +See https://github.com/mesonbuild/meson/issues/3892 +See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 +--- + .gitlab-ci.yml | 2 +- + doc/meson.build | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index 91bc1a9..05e8306 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -8,7 +8,7 @@ variables: + + + before_script: +- - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm ++ - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES + + + build: +diff --git a/doc/meson.build b/doc/meson.build +index 48358c8..c2c1b77 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint', + content_files: content_files, + expand_content_files: expand_content_files, + scan_args: [ +- '--rebuild-types', + '--ignore-decorators=API_EXPORTED', + '--ignore-headers=' + ' '.join(private_headers), + ], +-- +2.17.1 + diff --git a/libfprint.spec b/libfprint.spec index 7142908..9d0865f 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -11,6 +11,7 @@ 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(nss) @@ -19,6 +20,8 @@ BuildRequires: gtk-doc # For the udev.pc to install the rules BuildRequires: systemd +Patch0: 0001-build-Fix-build-with-newer-meson.patch + %description libfprint offers support for consumer fingerprint reader devices. @@ -31,7 +34,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%autosetup -S git %build %meson -Dx11-examples=false @@ -56,6 +59,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Fri Jul 20 2018 Bastien Nocera - 0.8.2-2 ++ libfprint-0.8.2-2 +- Fix build with newer meson (#1604585) + * Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 + libfprint-0.8.2-1 - Update to 0.8.2 From f219f61387067e087a8b224d944a5ae671819b3b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 20 Jul 2018 12:59:12 +0200 Subject: [PATCH 12/59] Remove gitlab CI changes, the file isn't in the tarball --- 0001-build-Fix-build-with-newer-meson.patch | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/0001-build-Fix-build-with-newer-meson.patch b/0001-build-Fix-build-with-newer-meson.patch index 3295bca..1840c85 100644 --- a/0001-build-Fix-build-with-newer-meson.patch +++ b/0001-build-Fix-build-with-newer-meson.patch @@ -12,23 +12,9 @@ See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 See https://github.com/mesonbuild/meson/issues/3892 See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 --- - .gitlab-ci.yml | 2 +- doc/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 91bc1a9..05e8306 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -8,7 +8,7 @@ variables: - - - before_script: -- - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm -+ - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES - - - build: diff --git a/doc/meson.build b/doc/meson.build index 48358c8..c2c1b77 100644 --- a/doc/meson.build From 793427c9c0bba57b83fda9023ab0daa1593cc601 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:09:35 +0000 Subject: [PATCH 13/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 9d0865f..0d66d8c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -59,6 +59,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 20 2018 Bastien Nocera - 0.8.2-2 + libfprint-0.8.2-2 - Fix build with newer meson (#1604585) From 1087048c0a70fe26e7f10234bc725bfb9110a762 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:17:23 +0000 Subject: [PATCH 14/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 0d66d8c..ae6f74b 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -59,6 +59,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f626147c2407e645334b4df58587837d150f7bf0 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 14 Aug 2019 13:35:44 +0200 Subject: [PATCH 15/59] + libfprint-1.0-1 Update to 1.0 --- .gitignore | 1 + 0001-build-Fix-build-with-newer-meson.patch | 32 --------------------- libfprint.spec | 10 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 0001-build-Fix-build-with-newer-meson.patch diff --git a/.gitignore b/.gitignore index 49a41ac..30697c9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.7.0.tar.xz /libfprint-0.8.1.tar.xz /libfprint-0.8.2.tar.xz +/libfprint-1.0.tar.xz diff --git a/0001-build-Fix-build-with-newer-meson.patch b/0001-build-Fix-build-with-newer-meson.patch deleted file mode 100644 index 1840c85..0000000 --- a/0001-build-Fix-build-with-newer-meson.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 20 Jul 2018 12:22:50 +0200 -Subject: [PATCH] build: Fix build with newer meson - -The gtk-doc meson helper regressed in that it didn't expect the -libfprint.types file to not exist, as earlier versions did. Remove -the --rebuild-types call so that it is not generated, and meson carries -on compiling the rest of the library. - -See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 -See https://github.com/mesonbuild/meson/issues/3892 -See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 ---- - doc/meson.build | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/doc/meson.build b/doc/meson.build -index 48358c8..c2c1b77 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint', - content_files: content_files, - expand_content_files: expand_content_files, - scan_args: [ -- '--rebuild-types', - '--ignore-decorators=API_EXPORTED', - '--ignore-headers=' + ' '.join(private_headers), - ], --- -2.17.1 - diff --git a/libfprint.spec b/libfprint.spec index ae6f74b..5fbf50d 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 0.8.2 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -20,8 +20,6 @@ BuildRequires: gtk-doc # For the udev.pc to install the rules BuildRequires: systemd -Patch0: 0001-build-Fix-build-with-newer-meson.patch - %description libfprint offers support for consumer fingerprint reader devices. @@ -59,6 +57,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Wed Aug 14 2019 Benjamin Berg - 1.0-1 ++ libfprint-1.0-1 +- Update to 1.0 + * Thu Jul 25 2019 Fedora Release Engineering - 0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 0549bb3..7b11a8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.8.2.tar.xz) = 4f051bffd8f09a634031f44f1ef8b030cff4300a237a97b824a1894fd5db0e3b13548e0919d0256bfd62658216d37797bd4f4bad43382dd70f5de1aca934ba6d +SHA512 (libfprint-1.0.tar.xz) = 6a38a691d1f2d5fe19b5bbda9b77321d2e34f1a3aa8b61f38109e0095b28e156cdd7be5ade8f3db8ff26045f8556b68e938b3e1378f4b6d84a2106566e7fdb53 From 656d4a87b6e2e73e8a279b0240f394dd5d0310d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:09:17 +0000 Subject: [PATCH 16/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 5fbf50d..7ad5b27 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -57,6 +57,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Aug 14 2019 Benjamin Berg - 1.0-1 + libfprint-1.0-1 - Update to 1.0 From d4b024a5def050733ed3b956fbc48a2cc6b91d81 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 8 Oct 2019 15:57:47 +0200 Subject: [PATCH 17/59] 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 - 1.90.1-1 +- Update to libfprint 1.90.1 + * Wed Jan 29 2020 Fedora Release Engineering - 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 + From f5dcab8b8c9ba2d9f3b66783d248f64ce12be769 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 14 Feb 2020 10:33:27 +0100 Subject: [PATCH 18/59] + libfprint-1.90.1-2 Rebuilt for F32 --- libfprint.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index d182cee..fade539 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.90.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -69,6 +69,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Fri Feb 14 2020 Bastien Nocera - 1.90.1-2 ++ libfprint-1.90.1-2 +- Rebuilt for F32 + * Mon Feb 10 2020 Benjamin Berg - 1.90.1-1 - Update to libfprint 1.90.1 From 5772cdf13fdd31766835da6364042314e96415f8 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 8 Jun 2020 14:27:40 +0200 Subject: [PATCH 19/59] Update to libfprint 1.90.2 Resolves #1832229 Resolves #1841834 Resolves #1841965 --- .gitignore | 1 + libfprint.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0073a4b..7af2a20 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.8.2.tar.xz /libfprint-1.0.tar.xz /libfprint-v1.90.1.tar.gz +/libfprint-v1.90.2.tar.gz diff --git a/libfprint.spec b/libfprint.spec index fade539..a010934 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint -Version: 1.90.1 -Release: 2%{?dist} +Version: 1.90.2 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -69,6 +69,12 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Mon Jun 08 2020 Benjamin Berg - 1.90.2-1 +- Update to libfprint 1.90.2 +- Resolves #1832229 +- Resolves #1841834 +- Resolves #1841965 + * Fri Feb 14 2020 Bastien Nocera - 1.90.1-2 + libfprint-1.90.1-2 - Rebuilt for F32 diff --git a/sources b/sources index 0774fe7..0bcb2ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.1.tar.gz) = 0548d29e55aaa59e73f0fd13cac6b85dd3a048358c365423e12884c3877c3e30422ee3fc4d18a3daba2f26383fb886f1d40a74dba5d947f7bdec6b8852995b4e +SHA512 (libfprint-v1.90.2.tar.gz) = 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226 From 92bdba7aaab2a0d6c030355b2ab647a913f834e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:40:16 +0000 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index a010934..db80134 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.90.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -69,6 +69,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.90.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 08 2020 Benjamin Berg - 1.90.2-1 - Update to libfprint 1.90.2 - Resolves #1832229 From 3800407d90ade449015a30d6e44e4e356b0468ed Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 19 Jun 2020 17:28:05 +0200 Subject: [PATCH 21/59] Add git dependency to gating --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index 7ee3761..8960255 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -9,6 +9,7 @@ - atomic - classic required_packages: + - git - python3-dbusmock - umockdev tests: From 929289033262b4d0be67cbff62029bfd2c923d2a Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 14 Sep 2020 15:04:52 +0200 Subject: [PATCH 22/59] Update to libfprint 1.90.3 (#1878746) --- .gitignore | 1 + libfprint.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7af2a20..3d38e51 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-1.0.tar.xz /libfprint-v1.90.1.tar.gz /libfprint-v1.90.2.tar.gz +/libfprint-v1.90.3.tar.gz diff --git a/libfprint.spec b/libfprint.spec index db80134..7c157fa 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint -Version: 1.90.2 -Release: 2%{?dist} +Version: 1.90.3 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -69,6 +69,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Mon Sep 14 2020 Benjamin Berg - 1.90.3-1 +- Update to libfprint 1.90.3 (#1878746) + * Tue Jul 28 2020 Fedora Release Engineering - 1.90.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 0bcb2ef..d25e8af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.2.tar.gz) = 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226 +SHA512 (libfprint-v1.90.3.tar.gz) = 3420df99c0e388af523f74c008fe603d28599d2ca482ec12a777d8b876e959cac946405fb14ba41fa536997ebd6857d945453e1374a0e05cd8f4fb02ca739891 From 03b482819ed224712e084c62cfcac8219c1400bb Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 27 Nov 2020 14:59:00 +0100 Subject: [PATCH 23/59] tests: Fix git dependency for source stage --- tests/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 8960255..ab999c2 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -4,12 +4,13 @@ - role: standard-test-source tags: - always + required_packages: + - git - role: standard-test-basic tags: - atomic - classic required_packages: - - git - python3-dbusmock - umockdev tests: From 89ef62a352cb701f4c6b3e993b6bb91c82836415 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 27 Nov 2020 15:12:24 +0100 Subject: [PATCH 24/59] New upstream release 1.90.4 (#1902256) Resolves #1889384 --- .gitignore | 1 + libfprint.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3d38e51..084f892 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.1.tar.gz /libfprint-v1.90.2.tar.gz /libfprint-v1.90.3.tar.gz +/libfprint-v1.90.4.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 7c157fa..609ff4c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.90.3 +Version: 1.90.4 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -69,6 +69,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Fri Nov 27 2020 Benjamin Berg - 1.90.4-1 +- New upstream release 1.90.4 (#1902256) + Resolves #1889384 + * Mon Sep 14 2020 Benjamin Berg - 1.90.3-1 - Update to libfprint 1.90.3 (#1878746) diff --git a/sources b/sources index d25e8af..9b9c520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.3.tar.gz) = 3420df99c0e388af523f74c008fe603d28599d2ca482ec12a777d8b876e959cac946405fb14ba41fa536997ebd6857d945453e1374a0e05cd8f4fb02ca739891 +SHA512 (libfprint-v1.90.4.tar.gz) = dc2c95ee1bb9821fd4442901aaafab36829ec34083708c1a568e9ddff1f1911398fdccb82db51139540483d0d660d337c61c8391277c0210f58da4ca244b64bd From 5641bb2bf961d8bb9d3f6a2d0107cccd5c503aa5 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 1 Dec 2020 15:31:41 +0100 Subject: [PATCH 25/59] New upstream release 1.90.5 (#1902256) --- .gitignore | 1 + libfprint.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 084f892..65dc5f1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.2.tar.gz /libfprint-v1.90.3.tar.gz /libfprint-v1.90.4.tar.gz +/libfprint-v1.90.5.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 609ff4c..2a18e9c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.90.4 +Version: 1.90.5 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -69,6 +69,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Tue Dec 01 2020 Benjamin Berg - 1.90.5-1 +- New upstream release 1.90.5 (#1902256) + * Fri Nov 27 2020 Benjamin Berg - 1.90.4-1 - New upstream release 1.90.4 (#1902256) Resolves #1889384 diff --git a/sources b/sources index 9b9c520..471d0d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.4.tar.gz) = dc2c95ee1bb9821fd4442901aaafab36829ec34083708c1a568e9ddff1f1911398fdccb82db51139540483d0d660d337c61c8391277c0210f58da4ca244b64bd +SHA512 (libfprint-v1.90.5.tar.gz) = 441d96fcb17d20198dc786780fd07a213366f48829e1ea90dec334d4ea441bf5c2c2218fc3b29c332bca0e8a0209e3df74a5845caa4b5f2552222ea760adf80f From bd329cd830192cb179d060a7ce2922facfa6a916 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 9 Dec 2020 15:29:22 +0100 Subject: [PATCH 26/59] New upstream release 1.90.6 (#1902256) --- .gitignore | 1 + ...ay-parameter-and-array-bounds-warnin.patch | 28 +++++++++++++++++++ libfprint.spec | 7 ++++- sources | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch diff --git a/.gitignore b/.gitignore index 65dc5f1..831f818 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.3.tar.gz /libfprint-v1.90.4.tar.gz /libfprint-v1.90.5.tar.gz +/libfprint-v1.90.6.tar.gz diff --git a/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch b/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch new file mode 100644 index 0000000..5399f18 --- /dev/null +++ b/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch @@ -0,0 +1,28 @@ +From 2d10d864d8bc4b952cf412f6e18e44412dba759a Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Wed, 9 Dec 2020 15:46:23 +0100 +Subject: [PATCH] nbis: Disable array-parameter and array-bounds warnings + +NBIS just does weird things and while the array-parameter warning is +easy to fix, the other is not trivial. So disable these warnings so that +we can still build using newer GCC versions. +--- + libfprint/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libfprint/meson.build b/libfprint/meson.build +index 96cfe9b..4d1d30c 100644 +--- a/libfprint/meson.build ++++ b/libfprint/meson.build +@@ -234,6 +234,8 @@ libnbis = static_library('nbis', + '-Wno-error=redundant-decls', + '-Wno-redundant-decls', + '-Wno-discarded-qualifiers', ++ '-Wno-array-bounds', ++ '-Wno-array-parameter', + ]), + install: false) + +-- +2.26.2 + diff --git a/libfprint.spec b/libfprint.spec index 2a18e9c..76b44b5 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.90.5 +Version: 1.90.6 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -26,6 +26,8 @@ BuildRequires: gobject-introspection-devel BuildRequires: python3-cairo python3-gobject cairo-devel BuildRequires: umockdev >= 0.13.2 +Patch000: 0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch + %description libfprint offers support for consumer fingerprint reader devices. @@ -69,6 +71,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Wed Dec 09 2020 Benjamin Berg - 1.90.6-1 +- New upstream release 1.90.6 (#1902256) + * Tue Dec 01 2020 Benjamin Berg - 1.90.5-1 - New upstream release 1.90.5 (#1902256) diff --git a/sources b/sources index 471d0d9..2b9e37d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.5.tar.gz) = 441d96fcb17d20198dc786780fd07a213366f48829e1ea90dec334d4ea441bf5c2c2218fc3b29c332bca0e8a0209e3df74a5845caa4b5f2552222ea760adf80f +SHA512 (libfprint-v1.90.6.tar.gz) = 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8 From ac50ff481a508ecfb6d5bf89a1755eece66053bd Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 13 Jan 2021 13:49:46 +0100 Subject: [PATCH 27/59] Update to 1.90.7 (#1902256) --- .gitignore | 1 + ...ay-parameter-and-array-bounds-warnin.patch | 28 ------------------- libfprint.spec | 6 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch diff --git a/.gitignore b/.gitignore index 831f818..7961d6f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.4.tar.gz /libfprint-v1.90.5.tar.gz /libfprint-v1.90.6.tar.gz +/libfprint-v1.90.7.tar.gz diff --git a/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch b/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch deleted file mode 100644 index 5399f18..0000000 --- a/0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d10d864d8bc4b952cf412f6e18e44412dba759a Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Wed, 9 Dec 2020 15:46:23 +0100 -Subject: [PATCH] nbis: Disable array-parameter and array-bounds warnings - -NBIS just does weird things and while the array-parameter warning is -easy to fix, the other is not trivial. So disable these warnings so that -we can still build using newer GCC versions. ---- - libfprint/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libfprint/meson.build b/libfprint/meson.build -index 96cfe9b..4d1d30c 100644 ---- a/libfprint/meson.build -+++ b/libfprint/meson.build -@@ -234,6 +234,8 @@ libnbis = static_library('nbis', - '-Wno-error=redundant-decls', - '-Wno-redundant-decls', - '-Wno-discarded-qualifiers', -+ '-Wno-array-bounds', -+ '-Wno-array-parameter', - ]), - install: false) - --- -2.26.2 - diff --git a/libfprint.spec b/libfprint.spec index 76b44b5..ddaca7c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.90.6 +Version: 1.90.7 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -26,7 +26,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: python3-cairo python3-gobject cairo-devel BuildRequires: umockdev >= 0.13.2 -Patch000: 0001-nbis-Disable-array-parameter-and-array-bounds-warnin.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -71,6 +70,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Wed Jan 13 13:33:12 CET 2021 Benjamin Berg - 1.90.7-1 +- Update to 1.90.7 (#1902256) + * Wed Dec 09 2020 Benjamin Berg - 1.90.6-1 - New upstream release 1.90.6 (#1902256) diff --git a/sources b/sources index 2b9e37d..9e5f821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.6.tar.gz) = 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8 +SHA512 (libfprint-v1.90.7.tar.gz) = 07803315c89000db4caae5ae64e19042d83638a866fb3d8bcc5e1efcc44424d321974021a9a43db362baa85f0c52fd40dc97ec186eee0954671ddb04f5dfaf2d From ac936eabf5425cc548bd9c116fbad95ac8c62acc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:05:26 +0000 Subject: [PATCH 28/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index ddaca7c..9f7cda6 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.90.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -70,6 +70,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.90.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 13:33:12 CET 2021 Benjamin Berg - 1.90.7-1 - Update to 1.90.7 (#1902256) From f570d66da9eabd667ffe0385606c310a4de39fe5 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 1 Jul 2021 17:11:22 +0200 Subject: [PATCH 29/59] Update to 1.92.0 (#1977842) --- .gitignore | 1 + 306.patch | 300 +++++++++++++++++++++++++++++++++++++++++++++++++ libfprint.spec | 12 +- sources | 2 +- 4 files changed, 311 insertions(+), 4 deletions(-) create mode 100644 306.patch diff --git a/.gitignore b/.gitignore index 7961d6f..86703ff 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.5.tar.gz /libfprint-v1.90.6.tar.gz /libfprint-v1.90.7.tar.gz +/libfprint-v1.92.0.tar.gz diff --git a/306.patch b/306.patch new file mode 100644 index 0000000..40ca308 --- /dev/null +++ b/306.patch @@ -0,0 +1,300 @@ +From 96afb4577986451eb41df39e4eea2b9d8f96cd7c Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 1 Jul 2021 17:37:53 +0200 +Subject: [PATCH 1/8] spi: Fix pointer cast on 32bit architectures + +--- + libfprint/fpi-spi-transfer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfprint/fpi-spi-transfer.c b/libfprint/fpi-spi-transfer.c +index f820c53d..f5d2617d 100644 +--- a/libfprint/fpi-spi-transfer.c ++++ b/libfprint/fpi-spi-transfer.c +@@ -323,7 +323,7 @@ transfer_chunk (FpiSpiTransfer *transfer, gsize full_length, gsize *transferred) + { + if (skip < transfer->length_wr && len < block_size) + { +- xfer[transfers].tx_buf = (guint64) transfer->buffer_wr + skip; ++ xfer[transfers].tx_buf = (gsize) transfer->buffer_wr + skip; + xfer[transfers].len = MIN (block_size, transfer->length_wr - skip); + + len += xfer[transfers].len; +@@ -340,7 +340,7 @@ transfer_chunk (FpiSpiTransfer *transfer, gsize full_length, gsize *transferred) + { + if (skip < transfer->length_rd && len < block_size) + { +- xfer[transfers].rx_buf = (guint64) transfer->buffer_rd + skip; ++ xfer[transfers].rx_buf = (gsize) transfer->buffer_rd + skip; + xfer[transfers].len = MIN (block_size, transfer->length_rd - skip); + + len += xfer[transfers].len; +-- +GitLab + + +From 9e5cf81ef8355b1c267a883b496e580080cbf1c6 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 1 Jul 2021 17:51:07 +0200 +Subject: [PATCH 2/8] upektc_img: Fix warnings in debug format strings + +--- + libfprint/drivers/upektc_img.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c +index 34e3b9de..19bc4158 100644 +--- a/libfprint/drivers/upektc_img.c ++++ b/libfprint/drivers/upektc_img.c +@@ -221,7 +221,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device, + if (response_size > transfer->actual_length) + { + fp_dbg ("response_size is %lu, actual_length is %d", +- response_size, (gint) transfer->actual_length); ++ (gulong) response_size, (gint) transfer->actual_length); + fp_dbg ("Waiting for rest of transfer"); + BUG_ON (self->response_rest); + self->response_rest = response_size - transfer->actual_length; +@@ -309,7 +309,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device, + data); + BUG_ON (self->image_size != IMAGE_SIZE); + fp_dbg ("Image size is %lu", +- self->image_size); ++ (gulong) self->image_size); + img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT); + img->flags |= FPI_IMAGE_PARTIAL; + memcpy (img->data, self->image_bits, +-- +GitLab + + +From 8edfd4203c72924e9dd3377a2f3e19174339e6fc Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 1 Jul 2021 18:27:13 +0200 +Subject: [PATCH 3/8] upektc: Fix format string on architectures where 64bit is + not long + +--- + libfprint/drivers/upektc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c +index c8113f6c..115e6b60 100644 +--- a/libfprint/drivers/upektc.c ++++ b/libfprint/drivers/upektc.c +@@ -411,7 +411,7 @@ dev_init (FpImageDevice *dev) + break; + + default: +- fp_err ("Device variant %lu is not known", driver_data); ++ fp_err ("Device variant %" G_GUINT64_FORMAT " is not known", driver_data); + g_assert_not_reached (); + fpi_image_device_open_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL)); + return; +-- +GitLab + + +From 78b1b679d79e0af0c17f8450b034b267ba837783 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 6 Jul 2021 20:48:12 +0200 +Subject: [PATCH 4/8] upeksonly: Fix format string warning by using unsigned + +There is no need to use size_t for num_rows as it is capped to NUM_ROWS +which is defined to 2048. +--- + libfprint/drivers/upeksonly.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c +index 5b2ffdf5..9d93cc76 100644 +--- a/libfprint/drivers/upeksonly.c ++++ b/libfprint/drivers/upeksonly.c +@@ -79,7 +79,7 @@ struct _FpiDeviceUpeksonly + int num_flying; + + GSList *rows; +- size_t num_rows; ++ unsigned num_rows; + unsigned char *rowbuf; + int rowbuf_offset; + +@@ -215,7 +215,7 @@ handoff_img (FpImageDevice *dev) + + self->rows = g_slist_reverse (self->rows); + +- fp_dbg ("%lu rows", self->num_rows); ++ fp_dbg ("%u rows", self->num_rows); + img = fpi_assemble_lines (&self->assembling_ctx, self->rows, self->num_rows); + + g_slist_free_full (self->rows, g_free); +@@ -295,7 +295,7 @@ row_complete (FpImageDevice *dev) + if (self->num_blank > FINGER_REMOVED_THRESHOLD) + { + self->finger_state = FINGER_REMOVED; +- fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %lu", ++ fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %u", + self->num_blank, self->num_rows); + handoff_img (dev); + return; +-- +GitLab + + +From 90b466f122aa74b58807e56720cd49f3b317a709 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 6 Jul 2021 20:55:00 +0200 +Subject: [PATCH 5/8] upekts: Fix format strings + +--- + libfprint/drivers/upekts.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c +index 1f1b1810..3d82cb33 100644 +--- a/libfprint/drivers/upekts.c ++++ b/libfprint/drivers/upekts.c +@@ -366,7 +366,7 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device, + fp_err ("async msg read too short (%d)", + (gint) transfer->actual_length); + error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, +- "Packet from device was too short (%lu)", ++ "Packet from device was too short (%" G_GSSIZE_FORMAT ")", + transfer->actual_length); + goto err; + } +@@ -993,7 +993,7 @@ e_handle_resp00 (FpDevice *dev, unsigned char *data, + + if (data_len != 14) + { +- fp_err ("received 3001 poll response of %lu bytes?", data_len); ++ fp_err ("received 3001 poll response of %" G_GSIZE_FORMAT " bytes?", data_len); + do_enroll_stop (dev, NULL, + fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, + "received 3001 response with wrong length")); +@@ -1090,7 +1090,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data, + + if (data_len < sizeof (scan_comp)) + { +- fp_err ("fingerprint data too short (%lu bytes)", data_len); ++ fp_err ("fingerprint data too short (%" G_GSIZE_FORMAT "u bytes)", data_len); + error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "fingerprint data too short"); + } + else if (memcmp (data, scan_comp, sizeof (scan_comp)) != 0) +@@ -1318,7 +1318,7 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data, + + if (data_len != 14) + { +- fp_warn ("received 3001 poll response of %lu bytes?", data_len); ++ fp_warn ("received 3001 poll response of %" G_GSIZE_FORMAT "u bytes?", data_len); + error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); + goto out; + } +-- +GitLab + + +From b872367aff0c0580318c9159c105a06ea849e613 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 6 Jul 2021 20:55:23 +0200 +Subject: [PATCH 6/8] virtual-device: Fix format strings + +--- + libfprint/drivers/virtual-device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfprint/drivers/virtual-device.c b/libfprint/drivers/virtual-device.c +index effcd593..1743692b 100644 +--- a/libfprint/drivers/virtual-device.c ++++ b/libfprint/drivers/virtual-device.c +@@ -192,7 +192,7 @@ process_cmds (FpDeviceVirtualDevice * self, + { + guint64 sleep_ms = g_ascii_strtoull (cmd + strlen (SLEEP_CMD_PREFIX), NULL, 10); + +- g_debug ("Sleeping %lums", sleep_ms); ++ g_debug ("Sleeping %" G_GUINT64_FORMAT "ms", sleep_ms); + self->sleep_timeout_id = g_timeout_add (sleep_ms, sleep_timeout_cb, self); + + return FALSE; +@@ -275,7 +275,7 @@ recv_instruction_cb (GObject *source_object, + gsize bytes; + + bytes = fpi_device_virtual_listener_read_finish (listener, res, &error); +- fp_dbg ("Got instructions of length %ld", bytes); ++ fp_dbg ("Got instructions of length %" G_GSIZE_FORMAT, bytes); + + if (error) + { +-- +GitLab + + +From 7bdb96f3df16e80432c7d0488762d0551cddc252 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 6 Jul 2021 22:49:15 +0200 +Subject: [PATCH 7/8] aesx660: Fix format strings + +--- + libfprint/drivers/aesx660.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c +index fb786600..dc0bc0de 100644 +--- a/libfprint/drivers/aesx660.c ++++ b/libfprint/drivers/aesx660.c +@@ -365,7 +365,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer, + return; + } + +- fp_dbg ("Got %lu bytes of data", actual_length); ++ fp_dbg ("Got %" G_GSIZE_FORMAT " bytes of data", actual_length); + while (actual_length) + { + gssize payload_length; +@@ -386,7 +386,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer, + (priv->stripe_packet->data[AESX660_RESPONSE_SIZE_MSB_OFFSET] << 8); + fp_dbg ("Got frame, type %.2x payload of size %.4lx", + priv->stripe_packet->data[AESX660_RESPONSE_TYPE_OFFSET], +- payload_length); ++ (long) payload_length); + + still_needed_len = MAX (0, AESX660_HEADER_SIZE + payload_length - (gssize) priv->stripe_packet->len); + copy_len = MIN (actual_length, still_needed_len); +@@ -441,7 +441,7 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev) + break; + + case CAPTURE_SET_IDLE: +- fp_dbg ("Got %lu frames", priv->strips_len); ++ fp_dbg ("Got %" G_GSIZE_FORMAT " frames", priv->strips_len); + aesX660_send_cmd (ssm, _dev, set_idle_cmd, sizeof (set_idle_cmd), + capture_set_idle_cmd_cb); + break; +-- +GitLab + + +From 94dbcc3d0da5e121a59f8fe634bae3d56a070464 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 6 Jul 2021 22:49:23 +0200 +Subject: [PATCH 8/8] elanspi: Fix format string + +--- + libfprint/drivers/elanspi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfprint/drivers/elanspi.c b/libfprint/drivers/elanspi.c +index fab958b6..daea67c3 100644 +--- a/libfprint/drivers/elanspi.c ++++ b/libfprint/drivers/elanspi.c +@@ -1219,7 +1219,7 @@ elanspi_guess_image (FpiDeviceElanSpi *self, guint16 *raw_image) + + sq_stddev /= (frame_width * frame_height); + +- fp_dbg (" stddev=%ld, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty); ++ fp_dbg (" stddev=%" G_GUINT64_FORMAT "d, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty); + + if (invalid_percent < ELANSPI_MAX_REAL_INVALID_PERCENT) + is_fp += 1; +-- +GitLab + diff --git a/libfprint.spec b/libfprint.spec index 9f7cda6..c8597f0 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint -Version: 1.90.7 -Release: 2%{?dist} +Version: 1.92.0 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -19,6 +19,7 @@ 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 @@ -26,6 +27,7 @@ BuildRequires: gobject-introspection-devel BuildRequires: python3-cairo python3-gobject cairo-devel BuildRequires: umockdev >= 0.13.2 +Patch0000: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/306.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -59,7 +61,8 @@ developing applications that use %{name}. %doc NEWS TODO THANKS AUTHORS README %{_libdir}/*.so.* %{_libdir}/girepository-1.0/*.typelib -%{_udevrulesdir}/60-libfprint-2-autosuspend.rules +%{_udevhwdbdir}/60-autosuspend-libfprint-2.hwdb +%{_udevrulesdir}/70-libfprint-2.rules %files devel %doc HACKING.md @@ -70,6 +73,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Thu Jul 01 2021 Benjamin Berg - 1.92.0-1 +- Update to 1.92.0 (#1977842) + * Tue Jan 26 2021 Fedora Release Engineering - 1.90.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 9e5f821..5b180a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.90.7.tar.gz) = 07803315c89000db4caae5ae64e19042d83638a866fb3d8bcc5e1efcc44424d321974021a9a43db362baa85f0c52fd40dc97ec186eee0954671ddb04f5dfaf2d +SHA512 (libfprint-v1.92.0.tar.gz) = 8993c550c38f3f7d5d50afe6d55414791bdb18e13600fa88d6ad85087e6c1ca664503a0969143c82a1f2fc3e2dbacb93e044fe9ebbb4d5835462d0d3ca03104f From 07130c0eb8de47f0ef2d6f3f0851c01c1b20170d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:24:08 +0000 Subject: [PATCH 30/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index c8597f0..c1fb6ca 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.92.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -73,6 +73,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.92.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 01 2021 Benjamin Berg - 1.92.0-1 - Update to 1.92.0 (#1977842) From f287a267a59ba184898245d0730345cced5fd60b Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 26 Jul 2021 20:23:48 +0200 Subject: [PATCH 31/59] Add patch disabling timeouts in virtual-device to enable fedora CI --- ...o-not-time-out-when-waiting-for-SCAN.patch | 53 +++++++++++++++++++ libfprint.spec | 7 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch diff --git a/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch b/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch new file mode 100644 index 0000000..fff73d7 --- /dev/null +++ b/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch @@ -0,0 +1,53 @@ +From 4cdca4da247b101e01d3c6266c4b2b3ba946c6f5 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Mon, 26 Jul 2021 19:45:02 +0200 +Subject: [PATCH] virtual-device: Do not time out when waiting for SCAN command + +The timeout is designed to continue commands automatically that are +common (e.g. opening the device). This doesn't really make sense for +scan commands, and removing the timeout enables test setups where user +interaction with the device may happen at arbitrary times. + +One exception is device removal/unplug, in which case the timeout will +be added anyway. +--- + libfprint/drivers/virtual-device.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libfprint/drivers/virtual-device.c b/libfprint/drivers/virtual-device.c +index 1743692..a9efb39 100644 +--- a/libfprint/drivers/virtual-device.c ++++ b/libfprint/drivers/virtual-device.c +@@ -150,6 +150,8 @@ process_cmds (FpDeviceVirtualDevice * self, + char **scan_id, + GError **error) + { ++ gboolean removed; ++ + if (g_cancellable_is_cancelled (self->cancellable) || + (fpi_device_get_current_action (FP_DEVICE (self)) != FPI_DEVICE_ACTION_NONE && + g_cancellable_is_cancelled (fpi_device_get_cancellable (FP_DEVICE (self))))) +@@ -250,8 +252,11 @@ process_cmds (FpDeviceVirtualDevice * self, + if (self->ignore_wait) + return TRUE; + ++ g_object_get (self, "removed", &removed, NULL); ++ + g_assert (self->wait_command_id == 0); +- self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self); ++ if (!scan || removed) ++ self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self); + return FALSE; + } + +@@ -304,6 +309,7 @@ recv_instruction_cb (GObject *source_object, + else if (g_str_has_prefix (cmd, UNPLUG_CMD)) + { + fpi_device_remove (FP_DEVICE (self)); ++ maybe_continue_current_action (self); + } + else if (g_str_has_prefix (cmd, SET_ENROLL_STAGES_PREFIX)) + { +-- +2.31.1 + diff --git a/libfprint.spec b/libfprint.spec index c1fb6ca..2349116 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.92.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -29,6 +29,8 @@ BuildRequires: umockdev >= 0.13.2 Patch0000: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/306.patch +Patch9999: 0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch + %description libfprint offers support for consumer fingerprint reader devices. @@ -73,6 +75,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Mon Jul 26 2021 Benjamin Berg - 1.92.0-3 +- Add patch disabling timeouts in virtual-device to enable fedora CI + * Thu Jul 22 2021 Fedora Release Engineering - 1.92.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 04c7a0ca5a945b2f66bd672c0403e17c61beb94b Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 27 Jul 2021 10:18:18 +0200 Subject: [PATCH 32/59] Increase timeout of tests by factor 4 --- libfprint.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 2349116..e0f4236 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -56,7 +56,7 @@ developing applications that use %{name}. %ldconfig_scriptlets %check -%meson_test +%meson_test -t 4 %files %license COPYING @@ -77,6 +77,7 @@ developing applications that use %{name}. %changelog * Mon Jul 26 2021 Benjamin Berg - 1.92.0-3 - Add patch disabling timeouts in virtual-device to enable fedora CI +- Increase timeout of tests by factor 4 * Thu Jul 22 2021 Fedora Release Engineering - 1.92.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 41b48ba54b3b4404c8415d4b67f029cd780d2512 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 20 Aug 2021 17:18:11 +0200 Subject: [PATCH 33/59] Update to 1.94.0 (#1977842) Related: #1894694 --- .gitignore | 1 + ...o-not-time-out-when-waiting-for-SCAN.patch | 53 ---- 306.patch | 300 ------------------ libfprint.spec | 12 +- sources | 2 +- 5 files changed, 8 insertions(+), 360 deletions(-) delete mode 100644 0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch delete mode 100644 306.patch diff --git a/.gitignore b/.gitignore index 86703ff..026bf07 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.6.tar.gz /libfprint-v1.90.7.tar.gz /libfprint-v1.92.0.tar.gz +/libfprint-v1.94.0.tar.gz diff --git a/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch b/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch deleted file mode 100644 index fff73d7..0000000 --- a/0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4cdca4da247b101e01d3c6266c4b2b3ba946c6f5 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Mon, 26 Jul 2021 19:45:02 +0200 -Subject: [PATCH] virtual-device: Do not time out when waiting for SCAN command - -The timeout is designed to continue commands automatically that are -common (e.g. opening the device). This doesn't really make sense for -scan commands, and removing the timeout enables test setups where user -interaction with the device may happen at arbitrary times. - -One exception is device removal/unplug, in which case the timeout will -be added anyway. ---- - libfprint/drivers/virtual-device.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libfprint/drivers/virtual-device.c b/libfprint/drivers/virtual-device.c -index 1743692..a9efb39 100644 ---- a/libfprint/drivers/virtual-device.c -+++ b/libfprint/drivers/virtual-device.c -@@ -150,6 +150,8 @@ process_cmds (FpDeviceVirtualDevice * self, - char **scan_id, - GError **error) - { -+ gboolean removed; -+ - if (g_cancellable_is_cancelled (self->cancellable) || - (fpi_device_get_current_action (FP_DEVICE (self)) != FPI_DEVICE_ACTION_NONE && - g_cancellable_is_cancelled (fpi_device_get_cancellable (FP_DEVICE (self))))) -@@ -250,8 +252,11 @@ process_cmds (FpDeviceVirtualDevice * self, - if (self->ignore_wait) - return TRUE; - -+ g_object_get (self, "removed", &removed, NULL); -+ - g_assert (self->wait_command_id == 0); -- self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self); -+ if (!scan || removed) -+ self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self); - return FALSE; - } - -@@ -304,6 +309,7 @@ recv_instruction_cb (GObject *source_object, - else if (g_str_has_prefix (cmd, UNPLUG_CMD)) - { - fpi_device_remove (FP_DEVICE (self)); -+ maybe_continue_current_action (self); - } - else if (g_str_has_prefix (cmd, SET_ENROLL_STAGES_PREFIX)) - { --- -2.31.1 - diff --git a/306.patch b/306.patch deleted file mode 100644 index 40ca308..0000000 --- a/306.patch +++ /dev/null @@ -1,300 +0,0 @@ -From 96afb4577986451eb41df39e4eea2b9d8f96cd7c Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Thu, 1 Jul 2021 17:37:53 +0200 -Subject: [PATCH 1/8] spi: Fix pointer cast on 32bit architectures - ---- - libfprint/fpi-spi-transfer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfprint/fpi-spi-transfer.c b/libfprint/fpi-spi-transfer.c -index f820c53d..f5d2617d 100644 ---- a/libfprint/fpi-spi-transfer.c -+++ b/libfprint/fpi-spi-transfer.c -@@ -323,7 +323,7 @@ transfer_chunk (FpiSpiTransfer *transfer, gsize full_length, gsize *transferred) - { - if (skip < transfer->length_wr && len < block_size) - { -- xfer[transfers].tx_buf = (guint64) transfer->buffer_wr + skip; -+ xfer[transfers].tx_buf = (gsize) transfer->buffer_wr + skip; - xfer[transfers].len = MIN (block_size, transfer->length_wr - skip); - - len += xfer[transfers].len; -@@ -340,7 +340,7 @@ transfer_chunk (FpiSpiTransfer *transfer, gsize full_length, gsize *transferred) - { - if (skip < transfer->length_rd && len < block_size) - { -- xfer[transfers].rx_buf = (guint64) transfer->buffer_rd + skip; -+ xfer[transfers].rx_buf = (gsize) transfer->buffer_rd + skip; - xfer[transfers].len = MIN (block_size, transfer->length_rd - skip); - - len += xfer[transfers].len; --- -GitLab - - -From 9e5cf81ef8355b1c267a883b496e580080cbf1c6 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Thu, 1 Jul 2021 17:51:07 +0200 -Subject: [PATCH 2/8] upektc_img: Fix warnings in debug format strings - ---- - libfprint/drivers/upektc_img.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c -index 34e3b9de..19bc4158 100644 ---- a/libfprint/drivers/upektc_img.c -+++ b/libfprint/drivers/upektc_img.c -@@ -221,7 +221,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device, - if (response_size > transfer->actual_length) - { - fp_dbg ("response_size is %lu, actual_length is %d", -- response_size, (gint) transfer->actual_length); -+ (gulong) response_size, (gint) transfer->actual_length); - fp_dbg ("Waiting for rest of transfer"); - BUG_ON (self->response_rest); - self->response_rest = response_size - transfer->actual_length; -@@ -309,7 +309,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device, - data); - BUG_ON (self->image_size != IMAGE_SIZE); - fp_dbg ("Image size is %lu", -- self->image_size); -+ (gulong) self->image_size); - img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT); - img->flags |= FPI_IMAGE_PARTIAL; - memcpy (img->data, self->image_bits, --- -GitLab - - -From 8edfd4203c72924e9dd3377a2f3e19174339e6fc Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Thu, 1 Jul 2021 18:27:13 +0200 -Subject: [PATCH 3/8] upektc: Fix format string on architectures where 64bit is - not long - ---- - libfprint/drivers/upektc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c -index c8113f6c..115e6b60 100644 ---- a/libfprint/drivers/upektc.c -+++ b/libfprint/drivers/upektc.c -@@ -411,7 +411,7 @@ dev_init (FpImageDevice *dev) - break; - - default: -- fp_err ("Device variant %lu is not known", driver_data); -+ fp_err ("Device variant %" G_GUINT64_FORMAT " is not known", driver_data); - g_assert_not_reached (); - fpi_image_device_open_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL)); - return; --- -GitLab - - -From 78b1b679d79e0af0c17f8450b034b267ba837783 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 6 Jul 2021 20:48:12 +0200 -Subject: [PATCH 4/8] upeksonly: Fix format string warning by using unsigned - -There is no need to use size_t for num_rows as it is capped to NUM_ROWS -which is defined to 2048. ---- - libfprint/drivers/upeksonly.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c -index 5b2ffdf5..9d93cc76 100644 ---- a/libfprint/drivers/upeksonly.c -+++ b/libfprint/drivers/upeksonly.c -@@ -79,7 +79,7 @@ struct _FpiDeviceUpeksonly - int num_flying; - - GSList *rows; -- size_t num_rows; -+ unsigned num_rows; - unsigned char *rowbuf; - int rowbuf_offset; - -@@ -215,7 +215,7 @@ handoff_img (FpImageDevice *dev) - - self->rows = g_slist_reverse (self->rows); - -- fp_dbg ("%lu rows", self->num_rows); -+ fp_dbg ("%u rows", self->num_rows); - img = fpi_assemble_lines (&self->assembling_ctx, self->rows, self->num_rows); - - g_slist_free_full (self->rows, g_free); -@@ -295,7 +295,7 @@ row_complete (FpImageDevice *dev) - if (self->num_blank > FINGER_REMOVED_THRESHOLD) - { - self->finger_state = FINGER_REMOVED; -- fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %lu", -+ fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %u", - self->num_blank, self->num_rows); - handoff_img (dev); - return; --- -GitLab - - -From 90b466f122aa74b58807e56720cd49f3b317a709 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 6 Jul 2021 20:55:00 +0200 -Subject: [PATCH 5/8] upekts: Fix format strings - ---- - libfprint/drivers/upekts.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c -index 1f1b1810..3d82cb33 100644 ---- a/libfprint/drivers/upekts.c -+++ b/libfprint/drivers/upekts.c -@@ -366,7 +366,7 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device, - fp_err ("async msg read too short (%d)", - (gint) transfer->actual_length); - error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, -- "Packet from device was too short (%lu)", -+ "Packet from device was too short (%" G_GSSIZE_FORMAT ")", - transfer->actual_length); - goto err; - } -@@ -993,7 +993,7 @@ e_handle_resp00 (FpDevice *dev, unsigned char *data, - - if (data_len != 14) - { -- fp_err ("received 3001 poll response of %lu bytes?", data_len); -+ fp_err ("received 3001 poll response of %" G_GSIZE_FORMAT " bytes?", data_len); - do_enroll_stop (dev, NULL, - fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, - "received 3001 response with wrong length")); -@@ -1090,7 +1090,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data, - - if (data_len < sizeof (scan_comp)) - { -- fp_err ("fingerprint data too short (%lu bytes)", data_len); -+ fp_err ("fingerprint data too short (%" G_GSIZE_FORMAT "u bytes)", data_len); - error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "fingerprint data too short"); - } - else if (memcmp (data, scan_comp, sizeof (scan_comp)) != 0) -@@ -1318,7 +1318,7 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data, - - if (data_len != 14) - { -- fp_warn ("received 3001 poll response of %lu bytes?", data_len); -+ fp_warn ("received 3001 poll response of %" G_GSIZE_FORMAT "u bytes?", data_len); - error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); - goto out; - } --- -GitLab - - -From b872367aff0c0580318c9159c105a06ea849e613 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 6 Jul 2021 20:55:23 +0200 -Subject: [PATCH 6/8] virtual-device: Fix format strings - ---- - libfprint/drivers/virtual-device.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfprint/drivers/virtual-device.c b/libfprint/drivers/virtual-device.c -index effcd593..1743692b 100644 ---- a/libfprint/drivers/virtual-device.c -+++ b/libfprint/drivers/virtual-device.c -@@ -192,7 +192,7 @@ process_cmds (FpDeviceVirtualDevice * self, - { - guint64 sleep_ms = g_ascii_strtoull (cmd + strlen (SLEEP_CMD_PREFIX), NULL, 10); - -- g_debug ("Sleeping %lums", sleep_ms); -+ g_debug ("Sleeping %" G_GUINT64_FORMAT "ms", sleep_ms); - self->sleep_timeout_id = g_timeout_add (sleep_ms, sleep_timeout_cb, self); - - return FALSE; -@@ -275,7 +275,7 @@ recv_instruction_cb (GObject *source_object, - gsize bytes; - - bytes = fpi_device_virtual_listener_read_finish (listener, res, &error); -- fp_dbg ("Got instructions of length %ld", bytes); -+ fp_dbg ("Got instructions of length %" G_GSIZE_FORMAT, bytes); - - if (error) - { --- -GitLab - - -From 7bdb96f3df16e80432c7d0488762d0551cddc252 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 6 Jul 2021 22:49:15 +0200 -Subject: [PATCH 7/8] aesx660: Fix format strings - ---- - libfprint/drivers/aesx660.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c -index fb786600..dc0bc0de 100644 ---- a/libfprint/drivers/aesx660.c -+++ b/libfprint/drivers/aesx660.c -@@ -365,7 +365,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer, - return; - } - -- fp_dbg ("Got %lu bytes of data", actual_length); -+ fp_dbg ("Got %" G_GSIZE_FORMAT " bytes of data", actual_length); - while (actual_length) - { - gssize payload_length; -@@ -386,7 +386,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer, - (priv->stripe_packet->data[AESX660_RESPONSE_SIZE_MSB_OFFSET] << 8); - fp_dbg ("Got frame, type %.2x payload of size %.4lx", - priv->stripe_packet->data[AESX660_RESPONSE_TYPE_OFFSET], -- payload_length); -+ (long) payload_length); - - still_needed_len = MAX (0, AESX660_HEADER_SIZE + payload_length - (gssize) priv->stripe_packet->len); - copy_len = MIN (actual_length, still_needed_len); -@@ -441,7 +441,7 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev) - break; - - case CAPTURE_SET_IDLE: -- fp_dbg ("Got %lu frames", priv->strips_len); -+ fp_dbg ("Got %" G_GSIZE_FORMAT " frames", priv->strips_len); - aesX660_send_cmd (ssm, _dev, set_idle_cmd, sizeof (set_idle_cmd), - capture_set_idle_cmd_cb); - break; --- -GitLab - - -From 94dbcc3d0da5e121a59f8fe634bae3d56a070464 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 6 Jul 2021 22:49:23 +0200 -Subject: [PATCH 8/8] elanspi: Fix format string - ---- - libfprint/drivers/elanspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfprint/drivers/elanspi.c b/libfprint/drivers/elanspi.c -index fab958b6..daea67c3 100644 ---- a/libfprint/drivers/elanspi.c -+++ b/libfprint/drivers/elanspi.c -@@ -1219,7 +1219,7 @@ elanspi_guess_image (FpiDeviceElanSpi *self, guint16 *raw_image) - - sq_stddev /= (frame_width * frame_height); - -- fp_dbg (" stddev=%ld, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty); -+ fp_dbg (" stddev=%" G_GUINT64_FORMAT "d, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty); - - if (invalid_percent < ELANSPI_MAX_REAL_INVALID_PERCENT) - is_fp += 1; --- -GitLab - diff --git a/libfprint.spec b/libfprint.spec index e0f4236..664b64b 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint -Version: 1.92.0 -Release: 3%{?dist} +Version: 1.94.0 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -27,10 +27,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: python3-cairo python3-gobject cairo-devel BuildRequires: umockdev >= 0.13.2 -Patch0000: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/306.patch - -Patch9999: 0001-virtual-device-Do-not-time-out-when-waiting-for-SCAN.patch - %description libfprint offers support for consumer fingerprint reader devices. @@ -75,6 +71,10 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Fri Aug 20 2021 Benjamin Berg - 1.94.0-1 +- Update to 1.94.0 (#1977842) + Related: #1894694 + * Mon Jul 26 2021 Benjamin Berg - 1.92.0-3 - Add patch disabling timeouts in virtual-device to enable fedora CI - Increase timeout of tests by factor 4 diff --git a/sources b/sources index 5b180a7..c84429d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.92.0.tar.gz) = 8993c550c38f3f7d5d50afe6d55414791bdb18e13600fa88d6ad85087e6c1ca664503a0969143c82a1f2fc3e2dbacb93e044fe9ebbb4d5835462d0d3ca03104f +SHA512 (libfprint-v1.94.0.tar.gz) = db2c6f88bacdddd44c825faf0ff70e90546261b6756f06bf6b45b8f5524734c11105eca2f3d7548f96f6974e1c1b9c644c7bb69e8ccdfbfcd3264e2d4b40869a From d4c27761b3588b987237e44a7a2f902e6a653100 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 25 Aug 2021 15:02:14 +0200 Subject: [PATCH 34/59] tests: Accept 77 error code This can happen in some cases (e.g. outdated umockdev), so accept error 77 (skipped test). --- tests/run-umockdev.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/run-umockdev.sh b/tests/run-umockdev.sh index 073f811..d8c5362 100755 --- a/tests/run-umockdev.sh +++ b/tests/run-umockdev.sh @@ -31,7 +31,10 @@ for test in ${TESTS[@]}; do RES=$? echo "$test finished with return code $RES" echo "" - ((RESULT += $RES)) + # Ignore skipped tests + if [ $RES -ne 0 -a $RES -ne 77 ]; then + RESULT=1 + fi done exit $RESULT From f8b7f550566d3da00ac80efb547dc0345858d63f Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 24 Sep 2021 17:38:59 +0200 Subject: [PATCH 35/59] Update to 1.94.1 --- .gitignore | 1 + libfprint.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 026bf07..fbe5b94 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.90.7.tar.gz /libfprint-v1.92.0.tar.gz /libfprint-v1.94.0.tar.gz +/libfprint-v1.94.1.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 664b64b..b0f317f 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.0 +Version: 1.94.1 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -71,6 +71,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Fri Sep 24 2021 Benjamin Berg - 1.94.1-1 +- Update to 1.94.1 + * Fri Aug 20 2021 Benjamin Berg - 1.94.0-1 - Update to 1.94.0 (#1977842) Related: #1894694 diff --git a/sources b/sources index c84429d..f75a2a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.0.tar.gz) = db2c6f88bacdddd44c825faf0ff70e90546261b6756f06bf6b45b8f5524734c11105eca2f3d7548f96f6974e1c1b9c644c7bb69e8ccdfbfcd3264e2d4b40869a +SHA512 (libfprint-v1.94.1.tar.gz) = 648ea42acbba720f16a265a8577256e5650a2706012879f689f8649c8a82aacedea6f0a90964367c884bd3ba13cee76ff5298c8e8e18f61dd769f07ab67bf341 From 6113d1b156353e4fdf0fe95b0d2039f4dc9a9e7b Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 3 Nov 2021 16:42:36 +0100 Subject: [PATCH 36/59] Update to 1.94.2 (#1977842) --- .gitignore | 1 + libfprint.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fbe5b94..ecc8d00 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.92.0.tar.gz /libfprint-v1.94.0.tar.gz /libfprint-v1.94.1.tar.gz +/libfprint-v1.94.2.tar.gz diff --git a/libfprint.spec b/libfprint.spec index b0f317f..6c73f3e 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.1 +Version: 1.94.2 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -71,6 +71,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Wed Nov 03 2021 Benjamin Berg - 1.94.2-1 +- Update to 1.94.2 (#1977842) + * Fri Sep 24 2021 Benjamin Berg - 1.94.1-1 - Update to 1.94.1 diff --git a/sources b/sources index f75a2a5..996e761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.1.tar.gz) = 648ea42acbba720f16a265a8577256e5650a2706012879f689f8649c8a82aacedea6f0a90964367c884bd3ba13cee76ff5298c8e8e18f61dd769f07ab67bf341 +SHA512 (libfprint-v1.94.2.tar.gz) = d18dd86652f18f3157eea5a3e66ed7b4e352b1cd7b8d4ec56d464bc044ee138cac8d09ace9a3259c2736cab84505e0c10bd192088295a11220fd03d5230cf499 From 302ca650b7264d02d5e442434ca4e074dbd464ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:14:36 +0000 Subject: [PATCH 37/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libfprint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 6c73f3e..b3ad447 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.94.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -71,6 +71,9 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Nov 03 2021 Benjamin Berg - 1.94.2-1 - Update to 1.94.2 (#1977842) From 3f62f551b41442bac4aaf9d2e36811ce45136888 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 14 Feb 2022 16:56:20 +0100 Subject: [PATCH 38/59] Switch to rpmautospec --- changelog | 259 ++++++++++++++++++++++++++++++++++++++++++++++++ libfprint.spec | 262 +------------------------------------------------ 2 files changed, 261 insertions(+), 260 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..6d23add --- /dev/null +++ b/changelog @@ -0,0 +1,259 @@ +* Thu Jan 20 2022 Fedora Release Engineering - 1.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 03 2021 Benjamin Berg - 1.94.2-1 +- Update to 1.94.2 (#1977842) + +* Fri Sep 24 2021 Benjamin Berg - 1.94.1-1 +- Update to 1.94.1 + +* Fri Aug 20 2021 Benjamin Berg - 1.94.0-1 +- Update to 1.94.0 (#1977842) + Related: #1894694 + +* Mon Jul 26 2021 Benjamin Berg - 1.92.0-3 +- Add patch disabling timeouts in virtual-device to enable fedora CI +- Increase timeout of tests by factor 4 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.92.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 01 2021 Benjamin Berg - 1.92.0-1 +- Update to 1.92.0 (#1977842) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.90.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 13:33:12 CET 2021 Benjamin Berg - 1.90.7-1 +- Update to 1.90.7 (#1902256) + +* Wed Dec 09 2020 Benjamin Berg - 1.90.6-1 +- New upstream release 1.90.6 (#1902256) + +* Tue Dec 01 2020 Benjamin Berg - 1.90.5-1 +- New upstream release 1.90.5 (#1902256) + +* Fri Nov 27 2020 Benjamin Berg - 1.90.4-1 +- New upstream release 1.90.4 (#1902256) + Resolves #1889384 + +* Mon Sep 14 2020 Benjamin Berg - 1.90.3-1 +- Update to libfprint 1.90.3 (#1878746) + +* Tue Jul 28 2020 Fedora Release Engineering - 1.90.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 08 2020 Benjamin Berg - 1.90.2-1 +- Update to libfprint 1.90.2 +- Resolves #1832229 +- Resolves #1841834 +- Resolves #1841965 + +* Fri Feb 14 2020 Bastien Nocera - 1.90.1-2 ++ libfprint-1.90.1-2 +- Rebuilt for F32 + +* Mon Feb 10 2020 Benjamin Berg - 1.90.1-1 +- Update to libfprint 1.90.1 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Aug 14 2019 Benjamin Berg - 1.0-1 ++ libfprint-1.0-1 +- Update to 1.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Bastien Nocera - 0.8.2-2 ++ libfprint-0.8.2-2 +- Fix build with newer meson (#1604585) + +* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 ++ libfprint-0.8.2-1 +- Update to 0.8.2 +- Add required gcc and gcc-c++ BR + +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Update to 0.8.1 to fix the build + +* Tue Jun 12 2018 Bastien Nocera - 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 - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 0.7.0-4 +- Switch to %%ldconfig_scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 0.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Bastien Nocera - 0.7.0-1 ++ libfprint-0.7.0-1 +- Update to 0.7.0 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Feb 03 2015 Bastien Nocera 0.6.0-1 +- Update to 0.6.0 + +* Wed Dec 17 2014 Rex Dieter - 0.5.1-5 +- error opening ATTR{/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.0/power/control} for writing (#950205) +- %%build: --disable-silent-rules + +* Sun Aug 17 2014 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jan 16 2014 Ville Skyttä - 0.5.1-2 +- Drop INSTALL from docs. + +* Sun Aug 11 2013 Bastien Nocera 0.5.1-1 +- Update to 0.5.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Dec 03 2012 Bastien Nocera 0.5.0-1 +- Update to 0.5.0 +- Re-add not useless udev rules + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri May 18 2012 Matthias Clasen - 0.4.0-4 +- Drop broken and useless udev rules (#744637) + +* Fri Jan 13 2012 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 21 2011 Adam Jackson 0.4.0-2 +- Rebuild without Requires: ConsoleKit, going away in F17 + +* Thu Nov 10 2011 Bastien Nocera 0.4.0-1 +- Update to 0.4.0 + +* Mon Nov 07 2011 Adam Jackson 0.3.0-3 +- Rebuild for libpng 1.5 + +* Mon Feb 07 2011 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Sep 08 2010 Bastien Nocera 0.3.0-1 +- Update to 0.3.0 + +* Thu Aug 19 2010 Bastien Nocera 0.2.0-1 +- Update to 0.2.0 + +* Wed Jun 30 2010 Matthew Garrett 0.1.0-16.pre3 +- Fix #505438 to avoid message on boot on some systems + +* Tue Jun 01 2010 Bastien Nocera 0.1.0-16.pre2 +- Add README to package + +* Wed Jan 20 2010 Bastien Nocera 0.1.0-15.pre2 +- Require hal-filesystem for the fdi file + +* Tue Dec 01 2009 Bastien Nocera 0.1.0-14.pre2 +- Update AES1610 patch + +* Mon Nov 30 2009 Bastien Nocera 0.1.0-13.pre2 +- Add aes1610 driver (#499732) + +* Thu Oct 01 2009 Bastien Nocera 0.1.0-12.pre2 +- Update udev autosuspend rules and disable SGS Thomson reader + +* Fri Aug 21 2009 Tomas Mraz - 0.1.0-11.pre2 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 0.1.0-10.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 21 2009 Bastien Nocera 0.1.0-9.pre2 +- Use gdk-pixbuf for image manipulation instead of ImageMagick (#472103) + +* Sat Jun 20 2009 Bastien Nocera 0.1.0-8.pre2 +- Update to 0.1.0-pre2 + +* Tue Jun 09 2009 Matthew Garrett 0.1.0-7.pre1 +- fprint-add-udev-rules.patch - build udev rules for autosuspend +- move hal fdi into the main package rather than -devel +- add autoreconf as a build depend while carrying the udev diff + +* Tue Apr 21 2009 Karsten Hopp 0.1.0-6.pre1.1 +- Excludearch s390 s390x, we don't have USB devices there and this package + doesn't build without USB support + +* Mon Mar 09 2009 pingou - 0.1.0-6.pre1 +- Rebuilt for rawhide + +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-5.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Tomas Mraz - 0.1.0-4.pre1 +- rebuild with new openssl + +* Tue Nov 25 2008 - Bastien Nocera - 0.1.0-3.pre1 +- Fix possible crasher in libfprint when setting up the fds for polling + +* Mon Nov 24 2008 - Bastien Nocera - 0.1.0-2.pre1 +- And add some API docs + +* Tue Nov 18 2008 - Bastien Nocera - 0.1.0-1.pre1 +- Fix build + +* Tue Nov 04 2008 - Bastien Nocera - 0.1.0-0.pre1 +- Update to 0.1.0-pre1 + +* Tue May 13 2008 Pingou 0.0.5-6 +- Correction on the Build Requires + +* Tue May 13 2008 Pingou 0.0.5-5 +- Correction on the Build Requires + +* Tue May 13 2008 Pingou 0.0.5-4 +- Update the Build Requires due to the change on ImageMagick + +* Tue Feb 19 2008 Fedora Release Engineering - 0.0.5-3 +- Autorebuild for GCC 4.3 + +* Sat Jan 05 2008 Pingou 0.0.5-2 +- Change on the BuildRequires + +* Sat Jan 05 2008 Pingou 0.0.5-1 +- Update to version 0.0.5 + +* Sat Dec 01 2007 Pingou 0.0.4-3 +- Changes on the Requires + +* Sun Nov 25 2007 Pingou 0.0.4-2 +- Changes on the Requires + +* Sat Nov 24 2007 Pingou 0.0.4-1 +- First release diff --git a/libfprint.spec b/libfprint.spec index b3ad447..7ed68b2 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,7 +1,7 @@ Name: libfprint Version: 1.94.2 -Release: 2%{?dist} +Release: %autorelease Summary: Toolkit for fingerprint scanner License: LGPLv2+ @@ -71,262 +71,4 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libfprint-2/ %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 1.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Nov 03 2021 Benjamin Berg - 1.94.2-1 -- Update to 1.94.2 (#1977842) - -* Fri Sep 24 2021 Benjamin Berg - 1.94.1-1 -- Update to 1.94.1 - -* Fri Aug 20 2021 Benjamin Berg - 1.94.0-1 -- Update to 1.94.0 (#1977842) - Related: #1894694 - -* Mon Jul 26 2021 Benjamin Berg - 1.92.0-3 -- Add patch disabling timeouts in virtual-device to enable fedora CI -- Increase timeout of tests by factor 4 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.92.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jul 01 2021 Benjamin Berg - 1.92.0-1 -- Update to 1.92.0 (#1977842) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.90.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 13:33:12 CET 2021 Benjamin Berg - 1.90.7-1 -- Update to 1.90.7 (#1902256) - -* Wed Dec 09 2020 Benjamin Berg - 1.90.6-1 -- New upstream release 1.90.6 (#1902256) - -* Tue Dec 01 2020 Benjamin Berg - 1.90.5-1 -- New upstream release 1.90.5 (#1902256) - -* Fri Nov 27 2020 Benjamin Berg - 1.90.4-1 -- New upstream release 1.90.4 (#1902256) - Resolves #1889384 - -* Mon Sep 14 2020 Benjamin Berg - 1.90.3-1 -- Update to libfprint 1.90.3 (#1878746) - -* Tue Jul 28 2020 Fedora Release Engineering - 1.90.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 08 2020 Benjamin Berg - 1.90.2-1 -- Update to libfprint 1.90.2 -- Resolves #1832229 -- Resolves #1841834 -- Resolves #1841965 - -* Fri Feb 14 2020 Bastien Nocera - 1.90.1-2 -+ libfprint-1.90.1-2 -- Rebuilt for F32 - -* Mon Feb 10 2020 Benjamin Berg - 1.90.1-1 -- Update to libfprint 1.90.1 - -* Wed Jan 29 2020 Fedora Release Engineering - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 14 2019 Benjamin Berg - 1.0-1 -+ libfprint-1.0-1 -- Update to 1.0 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Bastien Nocera - 0.8.2-2 -+ libfprint-0.8.2-2 -- Fix build with newer meson (#1604585) - -* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 -+ libfprint-0.8.2-1 -- Update to 0.8.2 -- Add required gcc and gcc-c++ BR - -* Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 -+ libfprint-0.8.1-1 -- Update to 0.8.1 to fix the build - -* Tue Jun 12 2018 Bastien Nocera - 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 - 0.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 0.7.0-4 -- Switch to %%ldconfig_scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Bastien Nocera - 0.7.0-1 -+ libfprint-0.7.0-1 -- Update to 0.7.0 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Feb 03 2015 Bastien Nocera 0.6.0-1 -- Update to 0.6.0 - -* Wed Dec 17 2014 Rex Dieter - 0.5.1-5 -- error opening ATTR{/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.0/power/control} for writing (#950205) -- %%build: --disable-silent-rules - -* Sun Aug 17 2014 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jan 16 2014 Ville Skyttä - 0.5.1-2 -- Drop INSTALL from docs. - -* Sun Aug 11 2013 Bastien Nocera 0.5.1-1 -- Update to 0.5.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Dec 03 2012 Bastien Nocera 0.5.0-1 -- Update to 0.5.0 -- Re-add not useless udev rules - -* Thu Jul 19 2012 Fedora Release Engineering - 0.4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri May 18 2012 Matthias Clasen - 0.4.0-4 -- Drop broken and useless udev rules (#744637) - -* Fri Jan 13 2012 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 21 2011 Adam Jackson 0.4.0-2 -- Rebuild without Requires: ConsoleKit, going away in F17 - -* Thu Nov 10 2011 Bastien Nocera 0.4.0-1 -- Update to 0.4.0 - -* Mon Nov 07 2011 Adam Jackson 0.3.0-3 -- Rebuild for libpng 1.5 - -* Mon Feb 07 2011 Fedora Release Engineering - 0.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 08 2010 Bastien Nocera 0.3.0-1 -- Update to 0.3.0 - -* Thu Aug 19 2010 Bastien Nocera 0.2.0-1 -- Update to 0.2.0 - -* Wed Jun 30 2010 Matthew Garrett 0.1.0-16.pre3 -- Fix #505438 to avoid message on boot on some systems - -* Tue Jun 01 2010 Bastien Nocera 0.1.0-16.pre2 -- Add README to package - -* Wed Jan 20 2010 Bastien Nocera 0.1.0-15.pre2 -- Require hal-filesystem for the fdi file - -* Tue Dec 01 2009 Bastien Nocera 0.1.0-14.pre2 -- Update AES1610 patch - -* Mon Nov 30 2009 Bastien Nocera 0.1.0-13.pre2 -- Add aes1610 driver (#499732) - -* Thu Oct 01 2009 Bastien Nocera 0.1.0-12.pre2 -- Update udev autosuspend rules and disable SGS Thomson reader - -* Fri Aug 21 2009 Tomas Mraz - 0.1.0-11.pre2 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 0.1.0-10.pre2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 21 2009 Bastien Nocera 0.1.0-9.pre2 -- Use gdk-pixbuf for image manipulation instead of ImageMagick (#472103) - -* Sat Jun 20 2009 Bastien Nocera 0.1.0-8.pre2 -- Update to 0.1.0-pre2 - -* Tue Jun 09 2009 Matthew Garrett 0.1.0-7.pre1 -- fprint-add-udev-rules.patch - build udev rules for autosuspend -- move hal fdi into the main package rather than -devel -- add autoreconf as a build depend while carrying the udev diff - -* Tue Apr 21 2009 Karsten Hopp 0.1.0-6.pre1.1 -- Excludearch s390 s390x, we don't have USB devices there and this package - doesn't build without USB support - -* Mon Mar 09 2009 pingou - 0.1.0-6.pre1 -- Rebuilt for rawhide - -* Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-5.pre1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 17 2009 Tomas Mraz - 0.1.0-4.pre1 -- rebuild with new openssl - -* Tue Nov 25 2008 - Bastien Nocera - 0.1.0-3.pre1 -- Fix possible crasher in libfprint when setting up the fds for polling - -* Mon Nov 24 2008 - Bastien Nocera - 0.1.0-2.pre1 -- And add some API docs - -* Tue Nov 18 2008 - Bastien Nocera - 0.1.0-1.pre1 -- Fix build - -* Tue Nov 04 2008 - Bastien Nocera - 0.1.0-0.pre1 -- Update to 0.1.0-pre1 - -* Tue May 13 2008 Pingou 0.0.5-6 -- Correction on the Build Requires - -* Tue May 13 2008 Pingou 0.0.5-5 -- Correction on the Build Requires - -* Tue May 13 2008 Pingou 0.0.5-4 -- Update the Build Requires due to the change on ImageMagick - -* Tue Feb 19 2008 Fedora Release Engineering - 0.0.5-3 -- Autorebuild for GCC 4.3 - -* Sat Jan 05 2008 Pingou 0.0.5-2 -- Change on the BuildRequires - -* Sat Jan 05 2008 Pingou 0.0.5-1 -- Update to version 0.0.5 - -* Sat Dec 01 2007 Pingou 0.0.4-3 -- Changes on the Requires - -* Sun Nov 25 2007 Pingou 0.0.4-2 -- Changes on the Requires - -* Sat Nov 24 2007 Pingou 0.0.4-1 -- First release +%autochangelog From b0ccaef332de78f1499b34291bca9a36713bf59f Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 14 Feb 2022 17:02:44 +0100 Subject: [PATCH 39/59] Don't set removed x11-examples option Resolves: #2045801 --- libfprint.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 7ed68b2..3cbe112 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -43,7 +43,7 @@ developing applications that use %{name}. %build # Include the virtual image driver for integration tests -%meson -Dx11-examples=false -Ddrivers=all +%meson -Ddrivers=all %meson_build %install From dc82faf4a4a8bd7321b3d5d2e49facfbcf10e9c7 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 14 Feb 2022 17:04:50 +0100 Subject: [PATCH 40/59] Update to 1.94.3 Resolves: #2053718 --- .gitignore | 1 + libfprint.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ecc8d00..3570b7c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.0.tar.gz /libfprint-v1.94.1.tar.gz /libfprint-v1.94.2.tar.gz +/libfprint-v1.94.3.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 3cbe112..3bed9d6 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.2 +Version: 1.94.3 Release: %autorelease Summary: Toolkit for fingerprint scanner @@ -56,7 +56,7 @@ developing applications that use %{name}. %files %license COPYING -%doc NEWS TODO THANKS AUTHORS README +%doc NEWS THANKS AUTHORS README.md %{_libdir}/*.so.* %{_libdir}/girepository-1.0/*.typelib %{_udevhwdbdir}/60-autosuspend-libfprint-2.hwdb diff --git a/sources b/sources index 996e761..ba640e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.2.tar.gz) = d18dd86652f18f3157eea5a3e66ed7b4e352b1cd7b8d4ec56d464bc044ee138cac8d09ace9a3259c2736cab84505e0c10bd192088295a11220fd03d5230cf499 +SHA512 (libfprint-v1.94.3.tar.gz) = f8f7a5fa4647e79c0251ea807bd5b84a07d1d2001962a86682298d671c9a21c22d6574e2cd31fc3a3b81b53838ef1e0ff922c125a7faa78270e699fc201f0257 From dc9e86e1e3f6f0271caddd9ef44a14f195b2b1f2 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 11 Jul 2022 15:06:54 +0200 Subject: [PATCH 41/59] Update to 1.94.4 Resolves: #2089823 --- .gitignore | 1 + libfprint.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3570b7c..6a84c14 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.1.tar.gz /libfprint-v1.94.2.tar.gz /libfprint-v1.94.3.tar.gz +/libfprint-v1.94.4.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 3bed9d6..5115125 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.3 +Version: 1.94.4 Release: %autorelease Summary: Toolkit for fingerprint scanner diff --git a/sources b/sources index ba640e1..8c0c8f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.3.tar.gz) = f8f7a5fa4647e79c0251ea807bd5b84a07d1d2001962a86682298d671c9a21c22d6574e2cd31fc3a3b81b53838ef1e0ff922c125a7faa78270e699fc201f0257 +SHA512 (libfprint-v1.94.4.tar.gz) = d1f2e62d5f08017912f8701e1b366f48dff9819897840a1570d16872fc2aad0a8757cd1d8e9d1b98e72e6b00f24ccb3d2aefc5abd824d2699cc75bc7ef8c8e93 From 7d22b98997e6cd86a8fcf1315723c03daaaa3b21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:50:00 +0000 Subject: [PATCH 42/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c5acc461259fd1749ae268d03a5d9f3cfd6078b2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 22 Nov 2022 13:06:12 +0100 Subject: [PATCH 43/59] Update to 1.94.5 --- .gitignore | 1 + libfprint.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a84c14..5f6dad0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.2.tar.gz /libfprint-v1.94.3.tar.gz /libfprint-v1.94.4.tar.gz +/libfprint-v1.94.5.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 5115125..ddae905 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.4 +Version: 1.94.5 Release: %autorelease Summary: Toolkit for fingerprint scanner diff --git a/sources b/sources index 8c0c8f0..51fc19a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.4.tar.gz) = d1f2e62d5f08017912f8701e1b366f48dff9819897840a1570d16872fc2aad0a8757cd1d8e9d1b98e72e6b00f24ccb3d2aefc5abd824d2699cc75bc7ef8c8e93 +SHA512 (libfprint-v1.94.5.tar.gz) = 033b7239acebfcccbb9f275cbbca52d68bf4a3a62f4c39a6323c943924532f73233fa3bf2e9517f6f4de04f513ba30776fcd3a98ebb8467fd2826e72a3ae3529 From 7eb880c0d65142f82b59b60f84e0a5b81ab9ff9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:21:25 +0000 Subject: [PATCH 44/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 098d70baba2a760f6c60614649fa371210407487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:53:00 +0000 Subject: [PATCH 45/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6305b23e2581bc1ef66a654b262afb08db09de44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:06:36 +0000 Subject: [PATCH 46/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c701ce89fb6efcfa7485c9e93d73c596e80d928e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:11:33 +0000 Subject: [PATCH 47/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4f101d393ee92f5792d413895dd95e9f9e7af17d Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 31 Jan 2024 13:34:45 +0800 Subject: [PATCH 48/59] Update to 1.94.6 Resolves: #2250624 --- .gitignore | 1 + libfprint.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f6dad0..b41a1b9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.3.tar.gz /libfprint-v1.94.4.tar.gz /libfprint-v1.94.5.tar.gz +/libfprint-v1.94.6.tar.gz diff --git a/libfprint.spec b/libfprint.spec index ddae905..491af24 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.5 +Version: 1.94.6 Release: %autorelease Summary: Toolkit for fingerprint scanner @@ -43,7 +43,7 @@ developing applications that use %{name}. %build # Include the virtual image driver for integration tests -%meson -Ddrivers=all +%meson -Ddrivers=all -Dinstalled-tests=false %meson_build %install diff --git a/sources b/sources index 51fc19a..129d049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.5.tar.gz) = 033b7239acebfcccbb9f275cbbca52d68bf4a3a62f4c39a6323c943924532f73233fa3bf2e9517f6f4de04f513ba30776fcd3a98ebb8467fd2826e72a3ae3529 +SHA512 (libfprint-v1.94.6.tar.gz) = 99cfce5828d7df771bfc1fd92ad357b76c265bc96443af3398c415d2bb54a931fa3018811c59ceb62b43ef416b430db4acf324aa1dca4f374eaef1f1595a154a From 05b84333616c82b751bbb18c9977029817de77cc Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Fri, 23 Feb 2024 18:26:28 +0000 Subject: [PATCH 49/59] Add tests subpackage --- libfprint.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 491af24..574619e 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -38,12 +38,20 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package tests +Summary: Tests for the %{name} package +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. + %prep %autosetup -S git -n libfprint-v%{version} %build # Include the virtual image driver for integration tests -%meson -Ddrivers=all -Dinstalled-tests=false +%meson -Ddrivers=all %meson_build %install @@ -70,5 +78,9 @@ developing applications that use %{name}. %{_datadir}/gir-1.0/*.gir %{_datadir}/gtk-doc/html/libfprint-2/ +%files tests +%{_libexecdir}/installed-tests/libfprint-2/ +%{_datadir}/installed-tests/libfprint-2/ + %changelog %autochangelog From 9a72ec14741631cf7755459eca836218b1b54716 Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Fri, 23 Feb 2024 18:41:57 +0000 Subject: [PATCH 50/59] Update to 1.94.7 Resolves: #2232471 --- .gitignore | 1 + libfprint.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b41a1b9..55ad153 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.4.tar.gz /libfprint-v1.94.5.tar.gz /libfprint-v1.94.6.tar.gz +/libfprint-v1.94.7.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 574619e..6b90f2f 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.6 +Version: 1.94.7 Release: %autorelease Summary: Toolkit for fingerprint scanner diff --git a/sources b/sources index 129d049..4bf9301 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.6.tar.gz) = 99cfce5828d7df771bfc1fd92ad357b76c265bc96443af3398c415d2bb54a931fa3018811c59ceb62b43ef416b430db4acf324aa1dca4f374eaef1f1595a154a +SHA512 (libfprint-v1.94.7.tar.gz) = 5e7afc8424862d2caaba9d6c2dbd0a339639497ddb7b096f1073464ebdfd9acec1b84470297bd51761dae4770d4113e336096536bb5f8700da2673a2685856b6 From 9dd7c7df011e96478d6779f9a6af966f465c2a6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:53:02 +0000 Subject: [PATCH 51/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f4e2d954bcc8a652dc894c3cc0de34f380d72e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 09:52:07 +0200 Subject: [PATCH 52/59] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- libfprint.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index 6b90f2f..53b5a92 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -4,7 +4,8 @@ Version: 1.94.7 Release: %autorelease Summary: Toolkit for fingerprint scanner -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-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 From 3a96323138fd2e08e341f5fdf6a41180c82a5994 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Tue, 24 Sep 2024 15:33:19 +0800 Subject: [PATCH 53/59] Update to upstream version 1.94.8 Resolves: #2232471 --- .gitignore | 1 + libfprint.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 55ad153..a4a0ef4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.5.tar.gz /libfprint-v1.94.6.tar.gz /libfprint-v1.94.7.tar.gz +/libfprint-v1.94.8.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 53b5a92..56d8554 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.7 +Version: 1.94.8 Release: %autorelease Summary: Toolkit for fingerprint scanner diff --git a/sources b/sources index 4bf9301..f377002 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.7.tar.gz) = 5e7afc8424862d2caaba9d6c2dbd0a339639497ddb7b096f1073464ebdfd9acec1b84470297bd51761dae4770d4113e336096536bb5f8700da2673a2685856b6 +SHA512 (libfprint-v1.94.8.tar.gz) = 4d72764dff7e8aeb343c51fce90fcab11cf3aab20c0796e03ae5e1d89c7223af16234fa410bc20513bf56d7de60d71bfcf29ec624373be7294e66f306f99edbd From c1b082f522cf45da3a5600d259c9da31ec726e1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:15:20 +0000 Subject: [PATCH 54/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 09c6ca8d0f1de2f594cbada99ee99d46e3231283 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Thu, 20 Mar 2025 14:59:34 +0800 Subject: [PATCH 55/59] Update to the upstream version 1.94.9 - Update to version 1.94.9 - Add openssl-devel dependency - Add a file /usr/share/metainfo/org.freedesktop.libfprint.metainfo.xml Resolves: #2232471 --- .gitignore | 1 + libfprint.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a4a0ef4..6205992 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.6.tar.gz /libfprint-v1.94.7.tar.gz /libfprint-v1.94.8.tar.gz +/libfprint-v1.94.9.tar.gz diff --git a/libfprint.spec b/libfprint.spec index 56d8554..07a5807 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.8 +Version: 1.94.9 Release: %autorelease Summary: Toolkit for fingerprint scanner @@ -14,6 +14,7 @@ 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 @@ -70,6 +71,7 @@ the functionality of the installed %{name} package. %{_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 diff --git a/sources b/sources index f377002..4920c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.8.tar.gz) = 4d72764dff7e8aeb343c51fce90fcab11cf3aab20c0796e03ae5e1d89c7223af16234fa410bc20513bf56d7de60d71bfcf29ec624373be7294e66f306f99edbd +SHA512 (libfprint-v1.94.9.tar.gz) = f8debcc1277e6112ed450c04a40cf6113afd7b38377b3fd259bedb1f553b29db758f3519491940bf9cd4ade0f8e70b68040d5bef4c8dbf5f7c2afc1802086397 From 35bbfe0e0d8c3d36e37af4132f4651ba85e978b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:39:59 +0000 Subject: [PATCH 56/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5e7d505a691630caaf9081d0c88f0bbd3d65abe4 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 6 Aug 2025 15:38:48 +0800 Subject: [PATCH 57/59] Migrate to tmt test Resolves: #2382943 --- .fmf/version | 1 + plans/integration.fmf | 5 +++++ tests/integration/main.fmf | 11 +++++++++++ tests/{ => integration}/run-umockdev.sh | 6 +++--- tests/tests.yml | 23 ----------------------- 5 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/integration.fmf create mode 100644 tests/integration/main.fmf rename tests/{ => integration}/run-umockdev.sh (79%) delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/integration.fmf b/plans/integration.fmf new file mode 100644 index 0000000..05fe63a --- /dev/null +++ b/plans/integration.fmf @@ -0,0 +1,5 @@ +summary: Test for libfprint +discover: + how: fmf +execute: + how: tmt diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf new file mode 100644 index 0000000..df893f0 --- /dev/null +++ b/tests/integration/main.fmf @@ -0,0 +1,11 @@ +summary: Test for libfprint +require: + - cairo-devel + - libfprint-devel + - libfprint-tests + - umockdev-devel + - python3-cairo + - python3-gobject-base + - python3-pip + - python3-packaging +test: bash ./run-umockdev.sh diff --git a/tests/run-umockdev.sh b/tests/integration/run-umockdev.sh similarity index 79% rename from tests/run-umockdev.sh rename to tests/integration/run-umockdev.sh index d8c5362..1beeca1 100755 --- a/tests/run-umockdev.sh +++ b/tests/integration/run-umockdev.sh @@ -2,7 +2,7 @@ set -u # Switch into the tests directory -cd source/tests || exit 1 +cd /usr/share/installed-tests/libfprint-2 || exit 1 # check if we need to install additional packages # which is the case if we are on RHEL 8 @@ -14,7 +14,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then pip3 install python-dbusmock fi -# Each directory in source/tests is a umockdev based test +# Each directory in /usr/share/installed-tests/libfprint-2 is a umockdev based test # discover them declare -a TESTS=() for f in *; do @@ -27,7 +27,7 @@ export FP_DEVICE_EMULATION=1 RESULT=0 for test in ${TESTS[@]}; do echo "$test" - ./umockdev-test.py "$test" + /usr/libexec/installed-tests/libfprint-2/umockdev-test.py "$test" RES=$? echo "$test finished with return code $RES" echo "" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index ab999c2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- 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 - From 0585fee3e159ad7a5ab789ad424e3fde639591ca Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 6 Aug 2025 15:42:28 +0800 Subject: [PATCH 58/59] Skip the %check section due to recent pygobject issues libfprint is trying to resolve the test issue. It was found when the test runs with pygobject3.52 and python3.14. So, the %check was temporarily skipped to ensure the build can be run. Resolves: #2385111 --- libfprint.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libfprint.spec b/libfprint.spec index 07a5807..cae76f9 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -61,8 +61,8 @@ the functionality of the installed %{name} package. %ldconfig_scriptlets -%check -%meson_test -t 4 +# TODO: The test can't run with the recent pygobject3.52. +# So, skip the test until the issue of pygobject is fixed. %files %license COPYING From 65fc4cc2fbb662b0e1f03005b051d8dc3e998767 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Dec 2025 12:12:38 -0500 Subject: [PATCH 59/59] Drop ExcludeArch for IBM Z to allow building there for COSMIC --- libfprint.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libfprint.spec b/libfprint.spec index cae76f9..e4479c7 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -8,7 +8,6 @@ Summary: Toolkit for fingerprint scanner License: LicenseRef-Callaway-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