From fcc5f6308f4f2c68578b66340875821d07b34924 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 20 Jul 2018 12:38:48 +0200
Subject: [PATCH] + libfprint-0.8.2-2 Fix build with newer meson (#1604585)

---
 0001-build-Fix-build-with-newer-meson.patch | 46 +++++++++++++++++++++
 libfprint.spec                              | 11 ++++-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 0001-build-Fix-build-with-newer-meson.patch

diff --git a/0001-build-Fix-build-with-newer-meson.patch b/0001-build-Fix-build-with-newer-meson.patch
new file mode 100644
index 0000000..3295bca
--- /dev/null
+++ b/0001-build-Fix-build-with-newer-meson.patch
@@ -0,0 +1,46 @@
+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
+---
+ .gitlab-ci.yml  | 2 +-
+ doc/meson.build | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index 91bc1a9..05e8306 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -8,7 +8,7 @@ variables:
+ 
+ 
+ before_script:
+-  - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm
++  - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
+ 
+ 
+ build:
+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.spec b/libfprint.spec
index 7142908..9d0865f 100644
--- a/libfprint.spec
+++ b/libfprint.spec
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Toolkit for fingerprint scanner
 
 License:        LGPLv2+
@@ -11,6 +11,7 @@ ExcludeArch:    s390 s390x
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+BuildRequires:  git
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 BuildRequires:  pkgconfig(libusb-1.0) >= 0.9.1
 BuildRequires:  pkgconfig(nss)
@@ -19,6 +20,8 @@ BuildRequires:  gtk-doc
 # For the udev.pc to install the rules
 BuildRequires:  systemd
 
+Patch0: 0001-build-Fix-build-with-newer-meson.patch
+
 %description
 libfprint offers support for consumer fingerprint reader devices.
 
@@ -31,7 +34,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%autosetup -S git
 
 %build
 %meson -Dx11-examples=false
@@ -56,6 +59,10 @@ developing applications that use %{name}.
 %{_datadir}/gtk-doc/html/libfprint/
 
 %changelog
+* Fri Jul 20 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.2-2
++ libfprint-0.8.2-2
+- Fix build with newer meson (#1604585)
+
 * Tue Jul 17 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.2-1
 + libfprint-0.8.2-1
 - Update to 0.8.2