nautilus: prefer shared-mime-info data over the one from nautilus

diff --git a/packages/nautilus/nautilus_2.24.1.bb b/packages/nautilus/nautilus_2.24.1.bb
index 0e94b93..4742641 100644 (file)
--- a/packages/nautilus/nautilus_2.24.1.bb
+++ b/packages/nautilus/nautilus_2.24.1.bb
@@ -2,19 +2,25 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
+PR = "r1"
+
 inherit gnome
 LICENSE="GPL"
 
 DEPENDS = "librsvg libexif eel esound gnome-desktop"
+RRECOMMENDS = "shared-mime-info"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-PACKAGES += "libnautilus"
+PACKAGES += "nautilus-mime-data libnautilus"
 
-FILES_${PN} += "${datadir}/icons ${datadir}/mime /usr/libexec/ "
+FILES_${PN} += "${datadir}/icons  /usr/libexec/ "
 FILES_libnautilus = "/usr/lib/*.so*"
 FILES_${PN}-dbg += "/usr/libexec/.debug"
 
+# This conflicts with shared-mime-info
+FILES_nautilus-mime-data += "${datadir}/mime"
+
 do_stage() {
        autotools_stage_all
 }