From f42853111da4ab5aec7dfd167b1d44140f21b9ec Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Wed, 9 May 2018 15:48:15 +0200 Subject: [PATCH] Switch to meson build system Autotools support has been dropped upstream. --- gvfs.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gvfs.spec b/gvfs.spec index 841c424..1e32c49 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -29,6 +29,7 @@ License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.37/gvfs-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(dbus-glib-1) @@ -208,18 +209,11 @@ the functionality of the installed gvfs package. %setup -q %build -%configure \ - --disable-gdu \ - --enable-udisks2 \ - --enable-keyring \ - --enable-installed-tests -make %{?_smp_mflags} V=1 +%meson -Dinstalled_tests=true -Dman=true +%meson_build %install -%make_install - -rm $RPM_BUILD_ROOT%{_libdir}/gvfs/*.la -rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la +%meson_install # trashlib is GPLv3, include the license cp -p daemon/trashlib/COPYING COPYING.GPL3 @@ -393,6 +387,7 @@ killall -USR1 gvfsd >&/dev/null || : * Wed May 09 2018 Ondrej Holy - 1.37.1-1 - Update to 1.37.1 - Remove mount-archive.desktop helper +- Switch to meson build system * Tue May 08 2018 Kalev Lember - 1.36.2-1 - Update to 1.36.2