From 062fb0102e69b4dcf972a7d5d85bff5f0ca67306 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 04:57:58 +0000 Subject: import libfprint-0.8.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 7366b1d..7ea8091 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libfprint-0.5.0.tar.xz +SOURCES/libfprint-0.8.2.tar.xz diff --git a/.libfprint.metadata b/.libfprint.metadata index d206127..c7070e7 100644 --- a/.libfprint.metadata +++ b/.libfprint.metadata @@ -1 +1 @@ -5eb33017e54211695121bca8460d4e416efd2c8d SOURCES/libfprint-0.5.0.tar.xz +c209f0c033ada641eec215cc96d11c30f233359d SOURCES/libfprint-0.8.2.tar.xz diff --git a/SOURCES/0001-Work-around-kernel-s-lack-of-USB-PM.patch b/SOURCES/0001-Work-around-kernel-s-lack-of-USB-PM.patch deleted file mode 100644 index c3a4d75..0000000 --- a/SOURCES/0001-Work-around-kernel-s-lack-of-USB-PM.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 81e01ae162201b192bf6780a0b339917899fe4dd Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 12 Apr 2016 16:10:53 +0200 -Subject: [PATCH] Work-around kernel's lack of USB PM - -https://bugzilla.redhat.com/show_bug.cgi?id=1173367 ---- - libfprint/fprint-list-udev-rules.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c -index 791a457..f35e90c 100644 ---- a/libfprint/fprint-list-udev-rules.c -+++ b/libfprint/fprint-list-udev-rules.c -@@ -25,6 +25,7 @@ - - static const struct usb_id whitelist_id_table[] = { - { .vendor = 0x08ff, .product = 0x2810 }, -+ { .vendor = 0x138a, .product = 0x0017 }, - { 0, 0, 0, }, - }; - --- -2.7.3 - diff --git a/SPECS/libfprint.spec b/SPECS/libfprint.spec index 4eced04..bebd9bb 100644 --- a/SPECS/libfprint.spec +++ b/SPECS/libfprint.spec @@ -1,20 +1,18 @@ Name: libfprint -Version: 0.5.0 -Release: 4%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint -Source0: http://freedesktop.org/~hadess/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x -BuildRequires: libusb1-devel glib2-devel gtk2-devel nss-devel -BuildRequires: doxygen autoconf automake libtool - -# https://bugzilla.redhat.com/show_bug.cgi?id=1173367 -Patch0: 0001-Work-around-kernel-s-lack-of-USB-PM.patch +BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel +# For the udev.pc to install the rules +BuildRequires: systemd +BuildRequires: gtk-doc meson %description libfprint offers support for consumer fingerprint reader devices. @@ -22,8 +20,7 @@ libfprint offers support for consumer fingerprint reader devices. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -33,43 +30,42 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .pm %build -%configure --disable-static -make %{?_smp_mflags} -pushd doc -make docs -popd +%meson -Dx11-examples=false +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - -%clean -rm -rf $RPM_BUILD_ROOT - +%meson_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%defattr(-,root,root,-) -%doc COPYING INSTALL NEWS TODO THANKS AUTHORS README +%license COPYING +%doc NEWS TODO THANKS AUTHORS README %{_libdir}/*.so.* -%{_prefix}/lib/udev/rules.d/60-fprint-autosuspend.rules +%{_udevrulesdir}/60-fprint-autosuspend.rules %files devel -%defattr(-,root,root,-) -%doc HACKING doc/html +%doc HACKING.md %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 ++ libfprint-0.8.2-1 +- Update to 0.8.2 +- Resolves: #1100801 + +* Fri Jun 15 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Update to 0.8.1 +- Resolves: #1100801 + * Tue Apr 12 2016 Bastien Nocera - 0.5.0-4 - Work-around the lack of USB PM in the kernel Resolves: #1173367