From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Fri, 8 Oct 2010 10:05:53 +0000 (+0200)
Subject: tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d533262dfe6845cf82386493916dfc021c3545ac;p=openembedded.git

tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}

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

diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 1f4dfdb7aa..9d7135411f 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,11 +3,11 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 DEFAULT_TIMEZONE ?= "Europe/London"
 
-RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
+RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \
              timezone-arctic timezone-asia timezone-atlantic \
              timezone-australia timezone-europe timezone-indian \
              timezone-iso3166.tab timezone-pacific timezone-zone.tab"