From a402b2d859e3b62c2c6ecd1e9fc9c3de7e8d0be9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 08:52:31 +0000 Subject: import fprintd-1.90.0-0.20191121gitf022902.el8 --- diff --git a/.fprintd.metadata b/.fprintd.metadata index 2516563..7fbac4c 100644 --- a/.fprintd.metadata +++ b/.fprintd.metadata @@ -1 +1 @@ -fbf31f3f11a7e80ee0fded85bbc293119fe96d73 SOURCES/fprintd-0.8.1.tar.xz +08e87c5686266c7bfb3d23070c292907e033f690 SOURCES/fprintd-f022902.tar.gz diff --git a/.gitignore b/.gitignore index 5a411ef..cba1b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/fprintd-0.8.1.tar.xz +SOURCES/fprintd-f022902.tar.gz diff --git a/SOURCES/0001-disable-tests.patch b/SOURCES/0001-disable-tests.patch new file mode 100644 index 0000000..0432a9d --- /dev/null +++ b/SOURCES/0001-disable-tests.patch @@ -0,0 +1,11 @@ +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' diff --git a/SPECS/fprintd.spec b/SPECS/fprintd.spec index c57db4c..d63bb2f 100644 --- a/SPECS/fprintd.spec +++ b/SPECS/fprintd.spec @@ -1,25 +1,32 @@ Name: fprintd -Version: 0.8.1 -Release: 2%{?dist} + +%global commit f02290257bab09c0ac6147bfa02e292fa3f0a3b1 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Version: 1.90.0 +Release: 0.20191121git%{shortcommit}%{?dist} Summary: D-Bus service for Fingerprint reader access Group: System Environment/Daemons License: GPLv2+ -Source0: https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/%{name}-%{version}.tar.xz 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: pam-devel -BuildRequires: libfprint-devel >= 0.1.0 +BuildRequires: libfprint-devel >= 1.90.0 BuildRequires: polkit-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: autoconf automake libtool BuildRequires: perl-podlators +# We cannot run the tests as python3-dbusmock is missing +Patch0001: 0001-disable-tests.patch + %description D-Bus service to access fingerprint readers. @@ -51,9 +58,11 @@ Development documentation for fprintd, the D-Bus service for fingerprint readers access. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n fprintd-%{commit} %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} @@ -82,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/fprintd # FIXME This file should be marked as config when it does something useful %{_sysconfdir}/fprintd.conf -%{_sysconfdir}/dbus-1/system.d/net.reactivated.Fprint.conf +%{_datadir}/dbus-1/system.d/net.reactivated.Fprint.conf %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service /usr/lib/systemd/system/fprintd.service %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy @@ -101,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml %changelog +* Thu Nov 21 2019 Benjamin Berg - 1.90.0-0.20191121git%{shortcommit} +- git snapshot build of fprintd 1.90.0 +- Resolves: rhbz1740752 + * Wed Aug 08 2018 Bastien Nocera - 0.8.1-2 + fprintd-0.8.1-2 - Require systemd for the .service installation location