From d6606b5feead01f3f6b4e51d0d4cddb601ac7992 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 25 May 2009 01:18:33 +0000 Subject: gnome.bbclass: remove unneeded scrollkeeper stuff from gnome packages. Scrollkeeper generates its XML database for every package when installing it. The problem is that while building it sees only specific package scrollkeeper stuff so we get wrong scrollkeeper xml file generated for every gnome.bbclass package. Including the file into every gnome package results in package contents conflicts. This patch removes a quick hack made by Koen with previous commit. Signed-off-by: Ihar Hrachyshka Acked-by: Phil Blundell Signed-off-by: Koen Kooi --- classes/gnome.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index d2ca739e40..da88884dde 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -17,9 +17,11 @@ inherit autotools gtk-icon-cache pkgconfig gconf mime AUTOTOOLS_STAGE_PKGCONFIG = "1" -PACKAGES =+ "${PN}-scrollkeeper-leftovers" -FILES_${PN}-scrollkeeper-leftovers = "${localstatedir}/lib/scrollkeeper" - gnome_stage_includes() { autotools_stage_includes } + +do_install_append() { + rm -rf ${D}${localstatedir}/lib/scrollkeeper/* +} + -- cgit 1.2.3-korg