diff --git a/.gitignore b/.gitignore index 6b23df5..49a41ac 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.5.1.tar.xz /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz +/libfprint-0.8.1.tar.xz +/libfprint-0.8.2.tar.xz diff --git a/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch b/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch new file mode 100644 index 0000000..f7e0188 --- /dev/null +++ b/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch @@ -0,0 +1,27 @@ +From 626b0f1a8fbf2e3acf8f3d2de411141bc3f6e913 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 17 Jul 2018 16:02:26 +0200 +Subject: [PATCH] lib: Include more standard headers for drivers to use + +Such as string.h and stdlib.h, to be able to compile on older +toolchains like that of Fedora 27. +--- + libfprint/drivers_api.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h +index 2679c77..cc844cd 100644 +--- a/libfprint/drivers_api.h ++++ b/libfprint/drivers_api.h +@@ -30,6 +30,8 @@ + + #include + #include ++#include ++#include + #include + #include + +-- +2.17.1 + diff --git a/libfprint.spec b/libfprint.spec index e2fe33b..5be5ece 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,19 +1,20 @@ Name: libfprint -Version: 0.7.0 -Release: 3%{?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/~anarsoul/%{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 nss-devel pixman-devel # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: doxygen autoconf automake libtool +BuildRequires: gtk-doc meson git + +Patch0: 0001-lib-Include-more-standard-headers-for-drivers-to-use.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -31,19 +32,14 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -S git %build -%configure --disable-silent-rules --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 {} ';' +%meson_install %clean rm -rf $RPM_BUILD_ROOT @@ -62,12 +58,21 @@ rm -rf $RPM_BUILD_ROOT %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 + +* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Port to meson and gtk-doc + * Thu Aug 03 2017 Fedora Release Engineering - 0.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index c7a739b..0549bb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.7.0.tar.xz) = 7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16 +SHA512 (libfprint-0.8.2.tar.xz) = 4f051bffd8f09a634031f44f1ef8b030cff4300a237a97b824a1894fd5db0e3b13548e0919d0256bfd62658216d37797bd4f4bad43382dd70f5de1aca934ba6d