12 files changed, 16 insertions, 16 deletions
diff --git a/recipes/abiword/abiword-embedded_2.4.6.bb b/recipes/abiword/abiword-embedded_2.4.6.bb
index 84bb8f1706..8ec952648f 100644
--- a/recipes/abiword/abiword-embedded_2.4.6.bb
+++ b/recipes/abiword/abiword-embedded_2.4.6.bb
@@ -2,8 +2,8 @@ require abiword.inc
 
 EXTRA_OECONF += "--enable-embedded"
 
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
+RCONFLICTS_${PN} = "abiword"
+RPROVIDES_${PN} += "abiword"
 
 do_compile_prepend() {
 	cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/
diff --git a/recipes/abiword/abiword-embedded_2.5.2.bb b/recipes/abiword/abiword-embedded_2.5.2.bb
index 67f516e10a..459cc277ed 100644
--- a/recipes/abiword/abiword-embedded_2.5.2.bb
+++ b/recipes/abiword/abiword-embedded_2.5.2.bb
@@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded"
 
 S = "${WORKDIR}/abiword-${PV}"
 
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
+RCONFLICTS_${PN} = "abiword"
+RPROVIDES_${PN} += "abiword"
 
 
 
diff --git a/recipes/abiword/abiword-embedded_2.6.4.bb b/recipes/abiword/abiword-embedded_2.6.4.bb
index 35808413cd..13951f862c 100644
--- a/recipes/abiword/abiword-embedded_2.6.4.bb
+++ b/recipes/abiword/abiword-embedded_2.6.4.bb
@@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded"
 
 S = "${WORKDIR}/abiword-${PV}"
 
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
+RCONFLICTS_${PN} = "abiword"
+RPROVIDES_${PN} += "abiword"
 
 SRC_URI[md5sum] = "16748b2d6e318e0e2a25581005e1943a"
 SRC_URI[sha256sum] = "4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe"
diff --git a/recipes/abiword/abiword-embedded_2.6.8.bb b/recipes/abiword/abiword-embedded_2.6.8.bb
index fc6e2d504b..ca48d77fef 100644
--- a/recipes/abiword/abiword-embedded_2.6.8.bb
+++ b/recipes/abiword/abiword-embedded_2.6.8.bb
@@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded"
 
 S = "${WORKDIR}/abiword-${PV}"
 
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
+RCONFLICTS_${PN} = "abiword"
+RPROVIDES_${PN} += "abiword"
 
 SRC_URI[md5sum] = "fab04d8ef999c303f720197adf261310"
 SRC_URI[sha256sum] = "b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93"
diff --git a/recipes/abiword/abiword_2.4.6.bb b/recipes/abiword/abiword_2.4.6.bb
index 7911571079..af0b5d4a58 100644
--- a/recipes/abiword/abiword_2.4.6.bb
+++ b/recipes/abiword/abiword_2.4.6.bb
@@ -1,6 +1,6 @@
 require abiword.inc
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 
 SRC_URI[md5sum] = "30fbd0a9b539f15f54f90d3812a75266"
diff --git a/recipes/abiword/abiword_2.5.1.bb b/recipes/abiword/abiword_2.5.1.bb
index fdf8fc6be1..2f90f528ad 100644
--- a/recipes/abiword/abiword_2.5.1.bb
+++ b/recipes/abiword/abiword_2.5.1.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 
 PR = "r2"
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 SRC_URI[md5sum] = "11d022458e0e090846b35ed4873c2e6e"
 SRC_URI[sha256sum] = "482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d"
diff --git a/recipes/abiword/abiword_2.5.2.bb b/recipes/abiword/abiword_2.5.2.bb
index a9e644db0c..35fd966437 100644
--- a/recipes/abiword/abiword_2.5.2.bb
+++ b/recipes/abiword/abiword_2.5.2.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 
 PR = "r1"
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
 SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
diff --git a/recipes/abiword/abiword_2.6.0.bb b/recipes/abiword/abiword_2.6.0.bb
index 9e9e43b3ae..d017966577 100644
--- a/recipes/abiword/abiword_2.6.0.bb
+++ b/recipes/abiword/abiword_2.6.0.bb
@@ -1,6 +1,6 @@
 require abiword-2.5.inc
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 SRC_URI[md5sum] = "d627a5d1061160c683f2257da498355b"
 SRC_URI[sha256sum] = "35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb"
diff --git a/recipes/abiword/abiword_2.6.3.bb b/recipes/abiword/abiword_2.6.3.bb
index 960ae979ae..576ca9c7b4 100644
--- a/recipes/abiword/abiword_2.6.3.bb
+++ b/recipes/abiword/abiword_2.6.3.bb
@@ -2,7 +2,7 @@ require abiword-2.5.inc
 
 PR = "r1"
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 FILES_${PN} 			+= "${datadir}/mime-info"
 FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
diff --git a/recipes/abiword/abiword_2.6.4.bb b/recipes/abiword/abiword_2.6.4.bb
index 711074e798..e12b93d720 100644
--- a/recipes/abiword/abiword_2.6.4.bb
+++ b/recipes/abiword/abiword_2.6.4.bb
@@ -2,7 +2,7 @@ require abiword-2.5.inc
 
 PR = "r2"
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 FILES_${PN} 			+= "${datadir}/mime-info"
 FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
diff --git a/recipes/abiword/abiword_2.6.8.bb b/recipes/abiword/abiword_2.6.8.bb
index f18bd430bb..4399371bc8 100644
--- a/recipes/abiword/abiword_2.6.8.bb
+++ b/recipes/abiword/abiword_2.6.8.bb
@@ -1,6 +1,6 @@
 require abiword-2.5.inc
 
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 FILES_${PN} 			+= "${datadir}/mime-info"
 FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb
index 96bc03c17e..781e096cda 100644
--- a/recipes/abiword/abiword_2.8.1.bb
+++ b/recipes/abiword/abiword_2.8.1.bb
@@ -18,7 +18,7 @@ EXTRA_OECONF = " --disable-static  \
                  --with-libwmf-config=${STAGING_DIR} \
 "
 DEPENDS += " libwmf-native gtkmathview "
-RCONFLICTS = "abiword-embedded"
+RCONFLICTS_${PN} = "abiword-embedded"
 
 FILES_${PN} 			+= "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
 FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"