!13 update to upstream version 1.94.3
From: @tanyulong2021 Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
dcbef6d303
@ -1,32 +0,0 @@
|
|||||||
From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
libfprint-v1.94.3.tar.gz
Normal file
BIN
libfprint-v1.94.3.tar.gz
Normal file
Binary file not shown.
@ -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
|
Name: libfprint
|
||||||
Version: 0.8.2
|
|
||||||
Release: 4
|
Version: 1.94.3
|
||||||
Summary: Development toolkit for fingerprint scanner
|
Release: 1
|
||||||
|
Summary: Toolkit for fingerprint scanner
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://fprint.freedesktop.org/
|
URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint
|
||||||
Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/4272fab4f37516db5b20d07bb576a4b1/libfprint-%{version}.tar.xz
|
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: meson
|
||||||
BuildRequires: pkgconfig(pixman-1) gtk-doc systemd gcc gcc-c++
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
Patch0000: 0001-build-Fix-build-with-newer-meson.patch
|
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
|
%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
|
%package devel
|
||||||
Summary: Development files for libfprint
|
Summary: Development files for %{name}
|
||||||
Requires: libfprint = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%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
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -S git -n libfprint-v%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -Dx11-examples=false
|
# Include the virtual image driver for integration tests
|
||||||
|
%meson -Ddrivers=all
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
%post
|
%ldconfig_scriptlets
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun
|
%check
|
||||||
/sbin/ldconfig
|
%meson_test -t 4
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS TODO THANKS AUTHORS README
|
%doc NEWS THANKS AUTHORS README.md
|
||||||
%{_libdir}/*.so.*
|
%{_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
|
%doc HACKING.md
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/libfprint.pc
|
%{_libdir}/pkgconfig/%{name}-2.pc
|
||||||
%{_datadir}/gtk-doc/html/libfprint/
|
%{_datadir}/gir-1.0/*.gir
|
||||||
|
%{_datadir}/gtk-doc/html/libfprint-2/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 16 2022 tanyulong <tanyulong@kylinos.cn> - 1.94.3-1
|
||||||
|
- update upstream version 1.94.3
|
||||||
|
|
||||||
* Wed Jun 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 0.8.2-4
|
* Wed Jun 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 0.8.2-4
|
||||||
- add buildrequire gcc and gcc-c++
|
- add buildrequire gcc and gcc-c++
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user