From 79e4de84063cdd3d8eab65ae93d9c896829212e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Jun 2012 20:08:18 +0200 Subject: recipes: replace CONFLICTS with RCONFLICTS_${PN} (From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/gettext/gettext_0.18.1.1.bb') 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 \ " -- cgit v1.2.3-54-g00ecf