From c108afff185054367a0817662c24870eafbb5b0f197ef2dabf6809adc387c815 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Apr 2013 06:10:08 +0000 Subject: [PATCH] New header location OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=28 --- wayland.changes | 1 + wayland.spec | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wayland.changes b/wayland.changes index 2ac3d12..3b9da55 100644 --- a/wayland.changes +++ b/wayland.changes @@ -5,6 +5,7 @@ Wed Apr 17 05:41:15 UTC 2013 - jengelh@inai.de * Optimize damage handling when moving surfaces in and out of planes * Touch screen calibration feature and client * Proper support for popup surfaces +- Use a header location that does not change with every release ------------------------------------------------------------------- Sun Mar 24 15:46:12 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/wayland.spec b/wayland.spec index 11b49bb..1bce6fe 100644 --- a/wayland.spec +++ b/wayland.spec @@ -105,7 +105,8 @@ to develop applications that require these. if [ ! -e configure ]; then autoreconf -fi; fi; -%configure --disable-static --includedir=%_includedir/%name-%version +# Ensure people will use pkgconfig to locate headers +%configure --disable-static --includedir="%_includedir/pkg/%name" make %{?_smp_mflags} %install @@ -139,7 +140,7 @@ XDG_RUNTIME_DIR="$PWD/xdg" make check %{?_smp_mflags}; %files devel %defattr(-,root,root) %_bindir/wayland-scanner -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libwayland-*.so %_libdir/pkgconfig/wayland-*.pc %_datadir/aclocal