[oe-commits] Frans Meulenbroeks : wesnoth_1.8.4.bb: RCONFLICTS -> RCONFLICTS_${PN}

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b41f8c74dfdd8104f800a328524e8a9f316a8da6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b41f8c74dfdd8104f800a328524e8a9f316a8da6

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Fri Oct  8 12:06:46 2010 +0200

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

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

---

 recipes/wesnoth/wesnoth_1.8.4.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/wesnoth/wesnoth_1.8.4.bb b/recipes/wesnoth/wesnoth_1.8.4.bb
index 81cb65c..b296e21 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"