[oe-commits] Julien 'Ainulindale' Cassignol : shr-splash: Tentatively fix the PREFERRED_PROVIDER issue.

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: faeefae076e7762407885b26ca8c268e4baa05fe
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=faeefae076e7762407885b26ca8c268e4baa05fe

Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Tue Aug  4 19:37:29 2009 +0200

shr-splash: Tentatively fix the PREFERRED_PROVIDER issue.
Signed-off-by: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>

---

 conf/distro/shr.conf             |    1 +
 recipes/shr/shr-splash-theme.inc |    2 +-
 recipes/shr/shr-splash_git.bb    |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 4e1893a..a0ed372 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -82,6 +82,7 @@ PREFERRED_PROVIDER_midpath = "midpath-openmoko"
 # We don't use this, but select one to shut bitbake up.
 PREFERRED_PROVIDER_virtual/libqte2 = "qte"
 
+PREFERRED_PROVIDER_shr-splash-theme-simple = "shr-splash-theme-simple"
 PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 PREFERRED_PROVIDER_frameworkd = "frameworkd"
diff --git a/recipes/shr/shr-splash-theme.inc b/recipes/shr/shr-splash-theme.inc
index f09e44c..2d342f4 100644
--- a/recipes/shr/shr-splash-theme.inc
+++ b/recipes/shr/shr-splash-theme.inc
@@ -1,4 +1,4 @@
-RPROVIDES += "virtual/shr-splash-theme"
+RPROVIDES = "virtual/shr-splash-theme"
 RDEPENDS += "shr-splash"
 
 inherit update-alternatives
diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb
index 1091d0f..8b79909 100644
--- a/recipes/shr/shr-splash_git.bb
+++ b/recipes/shr/shr-splash_git.bb
@@ -3,7 +3,8 @@ SECTION = "x11/data"
 LICENSE = "MIT BSD"
 PV = "1.2-gitr${SRCPV}"
 PR = "r3"
-RDEPENDS += "virtual/shr-splash-theme"
+RDEPENDS += "\
+	virtual/shr-splash-theme"
 
 inherit update-rc.d