Patchwork [meta-oe,08/10] gvfs-gdu-volume-monitor 1.8.2: remove conflicting files

login
register
mail settings
Submitter Koen Kooi
Date April 9, 2012, 3:16 p.m.
Message ID <1333984573-28464-8-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/25447/
State Accepted
Commit 839eeb13b83c2dda89901a2fe1b7f726d5b20b6b
Headers show

Comments

Koen Kooi - April 9, 2012, 3:16 p.m.
* check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
        But that file is already provided by package  * gvfs
 * check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
        But that file is already provided by package  * gvfs
 * check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/GConf/gsettings/gvfs-dns-sd.convert
        But that file is already provided by package  * gvfs

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb          |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Patch

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
index c87b63e..689f455 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
@@ -4,7 +4,7 @@  BPN = "gvfs"
 
 DEPENDS = "gvfs gnome-disk-utility"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # we need gdu files only: reduce files to delete in libexecdir
 EXTRA_OECONF += "--disable-gphoto2"
@@ -15,6 +15,8 @@  do_install_append() {
 	rm -rf ${D}${includedir}
 	rm -rf ${D}${libdir}
 	rm -rf ${D}${datadir}/gvfs/mounts
+	rm -rf ${D}${datadir}/glib-2.0
+	rm -rf ${D}${datadir}/GConf
 	rm -f ${D}${datadir}/dbus-1/services/gvfs-*
 	rm -f ${D}${libexecdir}/gvfsd*
 	rm -f ${D}${libexecdir}/gvfs-fuse-daemon