summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-gnome/abiword
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2010-12-23 19:23:33 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 10:03:10 (GMT)
commit0e8f0f0a033c79611a15914fde5826876502af2e (patch)
tree6eaed12c3fbab03d9adf193e923b6e20e2937f0d /meta-demoapps/recipes-gnome/abiword
parent35e3443b57d009bffd8904c7c6c3a4769193c1b4 (diff)
downloadpoky-0e8f0f0a033c79611a15914fde5826876502af2e.tar.gz
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/abiword')
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword.inc2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb4
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb2
5 files changed, 7 insertions, 5 deletions
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
index dcd3b85..e3f6a9d 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"
3SECTION = "x11/office" 3SECTION = "x11/office"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" 5DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
6RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 6RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
7 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 7 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
8 8
9SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" 9SRC_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 47cf9e0..7ee0f86 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 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2
3PR = "r1"
4
3EXTRA_OECONF += "--enable-embedded" 5EXTRA_OECONF += "--enable-embedded"
4 6
5S = "${WORKDIR}/abiword-${PV}" 7S = "${WORKDIR}/abiword-${PV}"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
index d2fabf9..5d7e3ce 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""
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5 5
6DEPENDS = "libgsf libglade libfribidi libxml2 wv" 6DEPENDS = "libgsf libglade libfribidi libxml2 wv"
7RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 7RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
9 9
10# Share this file between recipes that use cvs and that pull tarballs 10# 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 566d0fa..c10d761 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 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5RCONFLICTS = "abiword-embedded" 5RCONFLICTS_${PN} = "abiword-embedded"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
index e0e3bd7..4dffbd0 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
@@ -1,7 +1,7 @@
1require abiword.inc 1require abiword.inc
2 2
3PV="2.5.0+cvs${SRCDATE}" 3PV="2.5.0+cvs${SRCDATE}"
4PR = "r3" 4PR = "r4"
5 5
6SRC_URI = "${CVSURI}" 6SRC_URI = "${CVSURI}"
7 7