diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2010-12-23 20:23:33 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 10:03:10 +0000 |
| commit | 0e8f0f0a033c79611a15914fde5826876502af2e (patch) | |
| tree | 6eaed12c3fbab03d9adf193e923b6e20e2937f0d /meta-demoapps/recipes-gnome | |
| parent | 35e3443b57d009bffd8904c7c6c3a4769193c1b4 (diff) | |
| download | openembedded-core-0e8f0f0a033c79611a15914fde5826876502af2e.tar.gz openembedded-core-0e8f0f0a033c79611a15914fde5826876502af2e.tar.bz2 openembedded-core-0e8f0f0a033c79611a15914fde5826876502af2e.zip | |
RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-demoapps/recipes-gnome')
6 files changed, 9 insertions, 7 deletions
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc index dcd3b85534..e3f6a9d2b9 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" -RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb index 47cf9e03c0..7ee0f866a0 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb @@ -1,5 +1,7 @@ require abiword-2.5.inc +PR = "r1" + EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc index d2fabf931c..5d7e3ce600 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org"" LICENSE = "GPLv2" DEPENDS = "libgsf libglade libfribidi libxml2 wv" -RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" # Share this file between recipes that use cvs and that pull tarballs diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb index 566d0fa203..c10d761b06 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb @@ -1,5 +1,5 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb index e0e3bd7d60..4dffbd0710 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb @@ -1,7 +1,7 @@ require abiword.inc PV="2.5.0+cvs${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "${CVSURI}" diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb index 760c5c10af..3ac7d6e2eb 100644 --- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb @@ -1,10 +1,10 @@ DESCRIPTION = "GNOME Structured File Library" LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 bzip2 glib-2.0 zlib" -RDEPENDS = "gconf gnome-vfs" +RDEPENDS_${PN} = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " |