From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 25 May 2009 01:18:33 +0000 (+0000)
Subject: gnome.bbclass: remove unneeded scrollkeeper stuff from gnome packages.
X-Git-Tag: Release-2010-05/1~3327
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6606b5feead01f3f6b4e51d0d4cddb601ac7992;p=openembedded.git

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 <ihar.hrachyshka@gmail.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Koen Kooi <koen@openembedded.org>
---

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/*
+}
+