From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Fri, 8 Oct 2010 10:06:46 +0000 (+0200)
Subject: wesnoth_1.8.4.bb: RCONFLICTS -> RCONFLICTS_${PN}
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b41f8c74dfdd8104f800a328524e8a9f316a8da6;p=openembedded.git

wesnoth_1.8.4.bb: RCONFLICTS -> RCONFLICTS_${PN}

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/wesnoth/wesnoth_1.8.4.bb b/recipes/wesnoth/wesnoth_1.8.4.bb
index 81cb65ce68..b296e213f9 100644
--- a/recipes/wesnoth/wesnoth_1.8.4.bb
+++ b/recipes/wesnoth/wesnoth_1.8.4.bb
@@ -1,8 +1,8 @@
 require wesnoth.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-RCONFLICTS = "wesnoth-wvga"
+RCONFLICTS_${PN} = "wesnoth-wvga"
 EXTRA_OECMAKE += " -DGUI=tiny "
 
 SRC_URI[md5sum] = "2dce83f835ecce1d505ea60e46b7356f"