import fprintd-1.90.8-1.el8

.fprintd.metadata

@@ -1 +1 @@
-08e87c5686266c7bfb3d23070c292907e033f690 SOURCES/fprintd-f022902.tar.gz
+aa69a676e748454c4cce49b3613caac9e0ae2f37 SOURCES/fprintd-v1.90.8.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/fprintd-f022902.tar.gz
+SOURCES/fprintd-v1.90.8.tar.gz

SOURCES/0001-Add-compatibility-defines-to-allow-compiling-with-ol.patch

@@ -0,0 +1,37 @@
+From 32ee94c8a0079ee83a1b7d3910b1bbc6ccd8c747 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 14 Dec 2020 11:30:45 +0100
+Subject: [PATCH] Add compatibility defines to allow compiling with older glib
+
+We need at least the GFlagsClass autoptr, but just pull in most of the
+definitions from libfprint.
+---
+ src/fprintd.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/fprintd.h b/src/fprintd.h
+index 4075bc2..63a742e 100644
+--- a/src/fprintd.h
++++ b/src/fprintd.h
+@@ -91,3 +91,18 @@ FprintDevice *fprint_device_new (FpDevice *dev);
+ guint32 _fprint_device_get_id (FprintDevice *rdev);
+ /* Print */
+ /* TODO */
++
++
++/* Some compatibility definitions for older GLib. Copied from from libfprint. */
++#if !GLIB_CHECK_VERSION (2, 57, 0)
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (GTypeClass, g_type_class_unref);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (GEnumClass, g_type_class_unref);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (GFlagsClass, g_type_class_unref);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (GParamSpec, g_param_spec_unref);
++#else
++/* Re-define G_SOURCE_FUNC as we are technically not allowed to use it with
++ * the version we depend on currently. */
++#undef G_SOURCE_FUNC
++#endif
++
++#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void))(f))
+-- 
+2.26.2
+

SOURCES/0001-disable-test-dependencies.patch

@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index c1f40f3..c80fb9d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -141,7 +141,7 @@ python3_available_modules = []
+ 
+ foreach module, required : python3_test_modules
+     if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
+-        error('Python3 module \'' + module + '\' required by test suite not found')
++        warning('Python3 module \'' + module + '\' required by test suite not found')
+     endif
+ endforeach
+ 

SOURCES/0001-disable-tests.patch

@@ -1,11 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 9abc242..ebec8a2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- AUTOMAKE_OPTIONS = dist-bzip2
--SUBDIRS = src data utils pam doc tests po
-+SUBDIRS = src data utils pam doc po
- EXTRA_DIST = TODO intltool-extract.in intltool-merge.in intltool-update.in
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-systemdsystemunitdir='$${libdir}/systemd/system-distcheck'

SPECS/fprintd.spec

@@ -1,31 +1,33 @@
 Name:		fprintd
 
-%global commit f02290257bab09c0ac6147bfa02e292fa3f0a3b1
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Version:	1.90.0
-Release:	0.20191121git%{shortcommit}%{?dist}
+Version:	1.90.8
+Release:	1%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
 License:	GPLv2+
+Source0:	https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz
 Url:		http://www.freedesktop.org/wiki/Software/fprint/fprintd
-Source0:	https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    s390 s390x
 
-BuildRequires:	systemd
-BuildRequires:	dbus-glib-devel
+BuildRequires:  rpm-build
+BuildRequires:	meson
+BuildRequires:	gcc
+BuildRequires:	gcc-c++
+BuildRequires:	git
 BuildRequires:	pam-devel
-BuildRequires:	libfprint-devel >= 1.90.0
+BuildRequires:	libfprint-devel >= 1.90.1
 BuildRequires:	polkit-devel
 BuildRequires:	gtk-doc
-BuildRequires:	intltool
-BuildRequires:  autoconf automake libtool
+BuildRequires:	gettext
 BuildRequires:	perl-podlators
+BuildRequires:	systemd-devel
+BuildRequires:	pam_wrapper
 
-# We cannot run the tests as python3-dbusmock is missing
-Patch0001:	0001-disable-tests.patch
+# We cannot run the tests as python3-dbusmock and python3-libpamtest are missing
+Patch0001:	0001-disable-test-dependencies.patch
+Patch0002:	0001-Add-compatibility-defines-to-allow-compiling-with-ol.patch
 
 %description
 D-Bus service to access fingerprint readers.
@@ -58,22 +60,21 @@ Development documentation for fprintd, the D-Bus service for
 fingerprint readers access.
 
 %prep
-%autosetup -p1 -n fprintd-%{commit}
+%autosetup -S git -n %{name}-v%{version}
 
 %build
-# Run autogen.sh as this is a git snapshot build
-NOCONFIGURE=1 ./autogen.sh
-%configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
-
-make %{?_smp_mflags}
+%meson -Dgtk_doc=true -Dpam=true
+%meson_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/fprint
 
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_fprintd.{a,la,so.*}
 
+%check
+# The test suite will just throw errors due to missing dependencies
+
 %find_lang %{name}
 
 %postun pam
@@ -81,9 +82,6 @@ if [ $1 -eq 0 ]; then
   /sbin/authconfig --disablefingerprint --update || :
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS TODO
@@ -102,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc pam/README
 /%{_lib}/security/pam_fprintd.so
+%{_mandir}/man8/pam_fprintd.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -110,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Mon Dec 14 2020 Benjamin Berg <bberg@redhat.com> - 1.90.8-1
+- Update to fprintd 1.90.8
+  Related: #1888181
+
 * Thu Nov 21 2019 Benjamin Berg <bberg@redhat.com> - 1.90.0-0.20191121git%{shortcommit}
 - git snapshot build of fprintd 1.90.0
 - Resolves: rhbz1740752