summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-16 20:08:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:18:40 +0100
commitfbcda6eff010e0a39cc0145a514e7de99f475145 (patch)
treea64d1731bd75f4f5951ec43ba73c4870ee896faa /meta/recipes-core
parentabd5d5a712686a379a1a1da29d78a0f374f13e33 (diff)
downloadopenembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.gz
openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.bz2
openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.zip
recipes: replace CONFLICTS with RCONFLICTS_${PN}
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 253ea43851..7dd884449d 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,12 +5,12 @@ SECTION = "libs"
LICENSE = "GPLv3+ & LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r13"
+PR = "r14"
DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_virtclass-native = "virtual/gettext-native"
-CONFLICTS_${PN} = "proxy-libintl"
+RCONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://parallel.patch \
"