[oe-commits] Paul Eggleton : qconnman: use RCONFLICTS correctly

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 451c5cd71087077d2f09a539845caecaf2a2fa38
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=451c5cd71087077d2f09a539845caecaf2a2fa38

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Feb  4 11:29:38 2013 +0000

qconnman: use RCONFLICTS correctly

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
index 2fcd3da..1033bf2 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman"
+RCONFLICTS_${PN} = "qconnman"
 
 inherit qt4e
 
diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
index 9f03b90..d298cb5 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman-e"
+RCONFLICTS_${PN} = "qconnman-e"
 
 inherit qt4x11