[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7634/8267] libfm: remove file which conflicts with libfm-extra

[Emmanuele Bassi <ebassi src gnome org>]

commit 466b1c6d8d48194c7a50430ff795f553843a420d
Author: Ross Burton <ross burton intel com>
Date:   Thu Sep 7 13:30:35 2017 +0100

    libfm: remove file which conflicts with libfm-extra
    
    Both libfm and libfm-extra provide /usr/include/libfm, so remove it from libfm
    to avoid sysroot conflicts.
    
    (From OE-Core rev: 1ca7d8d89e35f55082d1708639e2146794730a0c)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/libfm/libfm_1.2.5.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index aca59e1..1ddddfd 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -32,6 +32,7 @@ do_install_append () {
     rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h
     rm -f ${D}${includedir}/libfm-1.0/fm-version.h
     rm -f ${D}${includedir}/libfm-1.0/fm-extra.h
+    rm -f ${D}${includedir}/libfm
     rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc
     rm -f ${D}${libdir}/libfm-extra.so*
     rm -f ${D}${libdir}/libfm-extra.a