From 3360701b275901cec690966ace812c889af4f89bd0ea2a9dababa174d951e251 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 1 Sep 2017 15:58:31 +0000 Subject: [PATCH] Accepting request 519751 from home:Zaitor:branches:X11:Wayland - Pass --includedir="%_includedir/%name" to meson, set includedir to "standard" for openSUSE, align with what we had before the switch to meson as buildsystem. OBS-URL: https://build.opensuse.org/request/show/519751 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=128 --- libinput.changes | 7 +++++++ libinput.spec | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libinput.changes b/libinput.changes index 0b1952d..be3d6eb 100644 --- a/libinput.changes +++ b/libinput.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 30 20:25:21 UTC 2017 - zaitor@opensuse.org + +- Pass --includedir="%_includedir/%name" to meson, set includedir + to "standard" for openSUSE, align with what we had before the + switch to meson as buildsystem. + ------------------------------------------------------------------- Mon Jul 24 17:13:19 UTC 2017 - zaitor@opensuse.org diff --git a/libinput.spec b/libinput.spec index fa50da7..413a54e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -101,6 +101,7 @@ to develop applications that require libinput. %build %meson \ + --includedir="%_includedir/%name" \ -Dudev-dir="%_prefix/lib/udev" \ -Dtests=false \ %nil @@ -142,7 +143,7 @@ rm -f "%buildroot/%_libdir"/*.la %_mandir/man1/libinput.1.gz %files devel -%_includedir/libinput.h +%_includedir/%name/ %_libdir/pkgconfig/libinput.pc %_libdir/libinput.so