import fprintd-1.90.9-2.el8

This commit is contained in:
CentOS Sources 2021-05-18 02:58:44 -04:00 committed by Andrew Lukoshko
parent c3dc3822ea
commit ade4b3d6f8
5 changed files with 56 additions and 37 deletions

View File

@ -1 +1 @@
08e87c5686266c7bfb3d23070c292907e033f690 SOURCES/fprintd-f022902.tar.gz
3d291f83deebd254b23fcd5fa4ef108afe94e82d SOURCES/fprintd-v1.90.9.tar.gz

2
.gitignore vendored
View File

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

View File

@ -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

View File

@ -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'

View File

@ -1,31 +1,32 @@
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.9
Release: 2%{?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
%description
D-Bus service to access fingerprint readers.
@ -58,32 +59,28 @@ 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.*}
%find_lang %{name}
%check
# The test suite will just throw errors due to missing dependencies
%postun pam
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 +99,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 +108,25 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
%changelog
* Wed Jan 20 17:47:44 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.90.9-2
- Fix build with --nocheck
The earlier fix was accidentally reverted again.
Resolves: #1907766
* Wed Jan 20 14:13:55 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.90.9-1
- Update to fprintd 1.90.9
Fixes: #1907766
Fixes: #1907954
Related: #1888181
* Tue Dec 15 2020 Benjamin Berg <bberg@redhat.com> - 1.90.8-2
- Fix build with --nocheck
Resolves: #1907766
* 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