mpg321/mpg123: let only main package conflict

diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb
index a92cf87..f766f93 100644 (file)
--- a/packages/mpg123/mpg123_0.66.bb
+++ b/packages/mpg123/mpg123_0.66.bb
@@ -3,8 +3,9 @@ for Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
 LICENSE = "LGPL"
 DESCRIPTION = "multimedia"
 HOMEPAGE = "http://www.mpg123.de"
-RCONFLICTS = "mpg321"
-RREPLACES = "mpg321"
+RCONFLICTS_${PN} = "mpg321"
+RREPLACES_${PN} = "mpg321"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2"
 

diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb
index 018fb17..cdbbd52 100644 (file)
--- a/packages/mpg321/mpg321_0.2.10.bb
+++ b/packages/mpg321/mpg321_0.2.10.bb
@@ -4,8 +4,9 @@ DEPENDS = "libmad libao"
 LICENSE = "GPL"
 AUTHOR = "Joe Drew <hoserhead@woot.net>"
 HOMEPAGE = "http://mpg321.sourceforge.net/"
-RCONFLICTS = "mpg123"
-RREPLACES = "mpg123"
+RCONFLICTS_${PN} = "mpg123"
+RREPLACES_${PN} = "mpg123"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \
            file://libao.m4.patch;patch=1"