From 07ce2f9af269e9c497da80017308019203181b57634aa5de7973650b0df5c526 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 12 Dec 2016 10:35:08 +0000 Subject: [PATCH] Accepting request 445250 from GNOME:Next - Use meson provided macros to build instead of carrying the long meson command lines. OBS-URL: https://build.opensuse.org/request/show/445250 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/graphene?expand=0&rev=4 --- graphene.changes | 6 ++++++ graphene.spec | 22 ++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/graphene.changes b/graphene.changes index f46b200..9b75b5e 100644 --- a/graphene.changes +++ b/graphene.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 6 14:13:57 UTC 2016 - dimstar@opensuse.org + +- Use meson provided macros to build instead of carrying the long + meson command lines. + ------------------------------------------------------------------- Mon Nov 28 00:01:10 UTC 2016 - jengelh@inai.de diff --git a/graphene.spec b/graphene.spec index 8d760db..3a80345 100644 --- a/graphene.spec +++ b/graphene.spec @@ -84,28 +84,14 @@ sed -i "s/©/(c)/" src/graphene-version.h.in # See gh#ebassie/graphene#82 export SUSE_ASNEEDED=0 %endif -mkdir build -pushd build -meson \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --libexecdir=%{_libexecdir} \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} \ - --default-library=shared \ - .. # sources are in the parent directory -ninja %{?_smp_mflags} +%meson +%meson_build %install -pushd build -DESTDIR=%{buildroot} ninja %{?_smp_mflags} install +%meson_install %check -pushd build -ninja test +%meson_test %post -n libgraphene-1_0-0 -p /sbin/ldconfig %postun -n libgraphene-1_0-0 -p /sbin/ldconfig