From 63cb0680f421fff8ebd77d787a66544e336c9d1e Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 14 Jun 2021 13:56:53 +0200 Subject: [PATCH] Use meson as the build system And fix some file locations --- iio-sensor-proxy.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/iio-sensor-proxy.spec b/iio-sensor-proxy.spec index 50d9510..9067c0d 100644 --- a/iio-sensor-proxy.spec +++ b/iio-sensor-proxy.spec @@ -7,7 +7,7 @@ License: GPLv3+ URL: https://github.com/hadess/iio-sensor-proxy Source0: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/uploads/2e2c1a92a6682f9ecf6789ed04c178d3/iio-sensor-proxy-3.1.tar.xz -BuildRequires: make +BuildRequires: meson BuildRequires: gcc BuildRequires: gtk-doc BuildRequires: pkgconfig(udev) @@ -15,6 +15,8 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gudev-1.0) BuildRequires: systemd +BuildRequires: umockdev +BuildRequires: python3-dbusmock %{?systemd_requires} %description @@ -31,15 +33,11 @@ This package contains the documentation for %{name}. %autosetup %build -%configure \ - --disable-silent-rules \ - --enable-gtk-doc \ - --disable-gtk-tests \ # not really interested in sample progs - %{nil} -%make_build +%meson -Dgtk_doc=true -Dgtk-tests=false +%meson_build %install -%make_install +%meson_install %post %systemd_post %{name}.service @@ -52,9 +50,9 @@ This package contains the documentation for %{name}. %files %license COPYING -%doc README +%doc README.md %{_bindir}/monitor-sensor -%{_sbindir}/%{name} +%{_libexecdir}/%{name} %{_unitdir}/%{name}.service %{_udevrulesdir}/*-%{name}.rules %{_sysconfdir}/dbus-1/system.d/net.hadess.SensorProxy.conf