From 1d733c2b654d1793edc47f52404bc3df42a0e793 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Sun, 14 Oct 2018 19:56:13 +0200
Subject: [PATCH] Update to 2.5.0

- Switch to the meson build system
- Build gtk-doc documentation
---
 .gitignore    |  1 +
 geoclue2.spec | 27 ++++++++++++++++++---------
 sources       |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48fc289..e595e0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /geoclue-2.*.tar.xz
+/geoclue-2.5.0.tar.bz2
diff --git a/geoclue2.spec b/geoclue2.spec
index f7c152f..565559b 100644
--- a/geoclue2.spec
+++ b/geoclue2.spec
@@ -1,19 +1,20 @@
 Name:           geoclue2
-Version:        2.4.11
+Version:        2.5.0
 Release:        1%{?dist}
 Summary:        Geolocation service
 
 License:        GPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/GeoClue/
-Source0:        http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-%{version}.tar.xz
+Source0:        https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/%{version}/geoclue-%{version}.tar.bz2
 
 BuildRequires:  avahi-glib-devel
+BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  intltool
-BuildRequires:  itstool
+BuildRequires:  gtk-doc
 BuildRequires:  json-glib-devel
 BuildRequires:  libsoup-devel
+BuildRequires:  meson
 BuildRequires:  ModemManager-glib-devel
 BuildRequires:  systemd
 BuildRequires:  vala
@@ -72,14 +73,12 @@ The %{name}-demos package contains demo applications that use %{name}.
 
 
 %build
-%configure --with-dbus-service-user=geoclue --enable-demo-agent
-make %{?_smp_mflags} V=1
+%meson -Ddbus-srv-user=geoclue
+%meson_build
 
 
 %install
-%make_install
-
-find $RPM_BUILD_ROOT -name '*.la' -delete
+%meson_install
 
 # Home directory for the 'geoclue' user
 mkdir -p $RPM_BUILD_ROOT/var/lib/geoclue
@@ -134,6 +133,10 @@ exit 0
 %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2*.xml
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Geoclue-2.0.gir
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/geoclue/
+%{_datadir}/gtk-doc/html/libgeoclue/
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libgeoclue-2.0.*
@@ -146,7 +149,13 @@ exit 0
 %{_libexecdir}/geoclue-2.0/demos/where-am-i
 %{_datadir}/applications/geoclue-where-am-i.desktop
 
+
 %changelog
+* Sun Oct 14 2018 Kalev Lember <klember@redhat.com> - 2.5.0-1
+- Update to 2.5.0
+- Switch to the meson build system
+- Build gtk-doc documentation
+
 * Thu Jul 26 2018 Kalev Lember <klember@redhat.com> - 2.4.11-1
 - Update to 2.4.11
 - Include vala bindings
diff --git a/sources b/sources
index 42dd242..6d9749e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geoclue-2.4.11.tar.xz) = a2b617e48cd60f930e75e3dbb6ac2b802cae307fdc2475ed727b3e0cc56a4eb14f3c240a4094e5ceb904bc537499d67d01487f8f91325d759964d04305e82130
+SHA512 (geoclue-2.5.0.tar.bz2) = 6fb337d89a87df93ee3a69285808f02d0b77d58ff336497c482a1fe476604ec5dfccfcb6b16e61104f55944d2db81544b8d350251713723c2b6a92757d2bffe6