[oe-commits] Khem Raj : gnome-control-center: Unbreak gnome images

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Apr 23 14:35:40 2014 -0700

gnome-control-center: Unbreak gnome images

images that now include both shared-mime-info and gnome-control-center We get

Collected errors:
 * check_data_file_clashes: Package gnome-control-center wants to
 * install file
 * /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/beaglebone-angstrom-linux-gnueabi/systemd-gnome-image/1.0-r0/rootfs/usr/share/mime/generic-icons
        But that file is already provided by package  * shared-mime-info

This brings it back to wheree it was additionally removes the packaging
warnings

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index ee25c1e..05e59cd 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -16,13 +16,15 @@ LDFLAGS += "-lgthread-2.0 -lxml2"
 do_configure_prepend() {
     sed -i s:help::g Makefile.am
 }
+do_install_append() {
+    rm -rf ${D}${datadir}/mime
+}
 
 FILES_${PN} += "${datadir}/icon* \
                 ${datadir}/xsession* \
                 ${libdir}/window-manager-settings/*.so \
                 ${datadir}/gnome \
                 ${datadir}/desktop-directories \
-                ${datadir}/mime \
 "
 FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
 FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"