diff --git a/fprintd-0.8.1.tar.xz b/fprintd-0.8.1.tar.xz deleted file mode 100644 index 4daba2e..0000000 Binary files a/fprintd-0.8.1.tar.xz and /dev/null differ diff --git a/fprintd-v1.94.2.tar.gz b/fprintd-v1.94.2.tar.gz new file mode 100644 index 0000000..2acd709 Binary files /dev/null and b/fprintd-v1.94.2.tar.gz differ diff --git a/fprintd.spec b/fprintd.spec index 4eb2d00..86052b7 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,14 +1,27 @@ -Name: fprintd -Version: 0.8.1 -Release: 6 -Summary: Support for consumer fingerprint reader devices -License: GPLv2+ -Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd -Source0: https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/%{name}-%{version}.tar.xz -Patch0: gcc-10.patch +Name: fprintd +Version: 1.94.2 +Release: 1 +Summary: D-Bus service for Fingerprint reader access + +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 +ExcludeArch: s390 s390x + +BuildRequires: meson +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: git +BuildRequires: pam-devel +BuildRequires: libfprint-devel >= 1.94.0 +BuildRequires: polkit-devel +BuildRequires: gtk-doc +BuildRequires: gettext +BuildRequires: perl-podlators +BuildRequires: systemd-devel +BuildRequires: python3-dbusmock +BuildRequires: python3-libpamtest -BuildRequires: dbus-glib-devel pam-devel libfprint-devel >= 0.1.0 polkit-devel gtk-doc -BuildRequires: intltool autoconf automake libtool perl-podlators pkgconfig(systemd) Provides: pam_fprint = %{version}-%{release} %{name}-pam = %{version}-%{release} Obsoletes: pam_fprint < 0.2-3 %{name}-pam < %{version}-%{release} @@ -37,17 +50,15 @@ BuildArch: noarch This package contains some man help files for %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -S git -n %{name}-v%{version} %build -%configure --libdir=%{_libdir} --enable-gtk-doc --enable-pam - -%make_build +%meson -Dgtk_doc=true -Dpam=true -Dpam_modules_dir=%{_libdir}/security +%meson_build %install -rm -rf %{buildroot} -%make_install -install -d %{buildroot}%{_localstatedir}/lib/fprint +%meson_install +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/fprint %find_lang %{name} @@ -67,12 +78,11 @@ fi %{_bindir}/fprintd-* %{_libexecdir}/fprintd %{_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 %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy -/usr/lib/systemd/system/fprintd.service +%{_unitdir}/fprintd.service %{_localstatedir}/lib/fprint -%exclude %{_libdir}/security/pam_fprintd.{a,la,so.*} %files devel %{_datadir}/gtk-doc/ @@ -80,8 +90,12 @@ fi %files help %{_mandir}/man1/fprintd.1.gz +%{_mandir}/man8/pam_fprintd.8.gz %changelog +* Mon May 30 2022 chenchen - 1.94.2-1 +- Update to 1.94.2 + * Fri Jul 30 2021 linjiaxin5 - 0.8.1-6 - Fix failure caused by GCC upgrade to 10 diff --git a/gcc-10.patch b/gcc-10.patch deleted file mode 100644 index d4a3961..0000000 --- a/gcc-10.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uprN src/main.c src/main.c ---- a/src/main.c 2018-05-25 21:59:57.000000000 +0800 -+++ b/src/main.c 2021-08-03 19:22:20.936874961 +0800 -@@ -34,6 +34,7 @@ - #include "storage.h" - #include "file_storage.h" - -+extern fp_storage store; - extern DBusGConnection *fprintd_dbus_conn; - static gboolean no_timeout = FALSE; - static gboolean g_fatal_warnings = FALSE; -diff -uprN src/storage.h src/storage.h ---- a/src/storage.h 2021-08-03 19:21:30.172006757 +0800 -+++ b/src/storage.h 2021-08-03 19:21:06.431600737 +0800 -@@ -44,7 +44,7 @@ struct storage { - typedef struct storage fp_storage; - - /* The currently setup store */ --fp_storage store; -+extern fp_storage store; - - #endif - -diff -uprN src/device.c src/device.c ---- a/src/device.c 2021-08-03 19:21:01.023508246 +0800 -+++ b/src/device.c 2021-08-03 19:22:03.900583598 +0800 -@@ -34,6 +34,7 @@ - #include "fprintd.h" - #include "storage.h" - -+fp_storage store; - static char *fingers[] = { - "left-thumb", - "left-index-finger",