From 09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Apr 2014 14:35:40 -0700 Subject: [PATCH] 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 Signed-off-by: Martin Jansa --- .../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 ee25c1ec0a..05e59cd8ad 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"