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-0.8.2.tar.xz b/libfprint-0.8.2.tar.xz deleted file mode 100644 index 9f33c40..0000000 Binary files a/libfprint-0.8.2.tar.xz and /dev/null differ diff --git a/libfprint-v1.94.3.tar.gz b/libfprint-v1.94.3.tar.gz new file mode 100644 index 0000000..60c96b7 Binary files /dev/null and b/libfprint-v1.94.3.tar.gz differ diff --git a/libfprint.spec b/libfprint.spec index d50db8f..6b392e0 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,57 +1,88 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.5) +%define autorelease(e:s:pb:) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} +## END: Set by rpmautospec + Name: libfprint -Version: 0.8.2 -Release: 4 -Summary: Development toolkit for fingerprint scanner + +Version: 1.94.3 +Release: 1 +Summary: Toolkit for fingerprint scanner License: LGPLv2+ -URL: https://fprint.freedesktop.org/ -Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/4272fab4f37516db5b20d07bb576a4b1/libfprint-%{version}.tar.xz +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 pkgconfig(glib-2.0) >= 2.28 pkgconfig(libusb-1.0) >= 0.9.1 pkgconfig(nss) -BuildRequires: pkgconfig(pixman-1) gtk-doc systemd gcc gcc-c++ - -Patch0000: 0001-build-Fix-build-with-newer-meson.patch +BuildRequires: meson +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: git +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 +BuildRequires: libgudev-devel +# 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 aims to add support for consumer fingerprint reader devices, in Linux, as well as other free Unices. +libfprint offers support for consumer fingerprint reader devices. %package devel -Summary: Development files for libfprint -Requires: libfprint = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -The libfprint-devel package provides libraries and header files which are used to developing applications using libfprint. +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup -S git -n libfprint-v%{version} %build -%meson -Dx11-examples=false +# Include the virtual image driver for integration tests +%meson -Ddrivers=all %meson_build %install %meson_install -%post -/sbin/ldconfig +%ldconfig_scriptlets -%postun -/sbin/ldconfig +%check +%meson_test -t 4 %files %license COPYING -%doc NEWS TODO THANKS AUTHORS README +%doc NEWS THANKS AUTHORS README.md %{_libdir}/*.so.* -%{_udevrulesdir}/60-fprint-autosuspend.rules +%{_libdir}/girepository-1.0/*.typelib +%{_udevhwdbdir}/60-autosuspend-libfprint-2.hwdb +%{_udevrulesdir}/70-libfprint-2.rules -%files devel +%files devel %doc HACKING.md %{_includedir}/* %{_libdir}/*.so -%{_libdir}/pkgconfig/libfprint.pc -%{_datadir}/gtk-doc/html/libfprint/ +%{_libdir}/pkgconfig/%{name}-2.pc +%{_datadir}/gir-1.0/*.gir +%{_datadir}/gtk-doc/html/libfprint-2/ %changelog +* Mon May 16 2022 tanyulong - 1.94.3-1 +- update upstream version 1.94.3 + * Wed Jun 30 2021 zhouwenpei - 0.8.2-4 - add buildrequire gcc and gcc-c++