From 79e4de84063cdd3d8eab65ae93d9c896829212e8 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Sat, 16 Jun 2012 20:08:18 +0200
Subject: recipes: replace CONFLICTS with RCONFLICTS_${PN}

(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb')

diff --git a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
index f70d79daeb..86f3ce328f 100644
--- a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
@@ -10,8 +10,8 @@ reporting."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
 
-CONFLICTS = "xxf86dgaext"
-PR = "r1"
+RCONFLICTS_${PN} = "xxf86dgaext"
+PR = "r2"
 PE = "1"
 
 SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
-- 
cgit v1.2.3-54-g00ecf