From 1083077a104f46a39d36301a60741a539e932a4e Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Tue, 15 Apr 2014 09:52:38 +0200
Subject: [PATCH] meta-tizen: Correct conflict between rpm and rpm-native
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Remove rpm-native_git.bb and add BBCLASSEXTEND = "native" to rpm_git.bb
to replace rpm-native.

(From meta-tizen rev: 66793a266c9074e1fedc2e1a4463f2a887877aa9)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 meta-tizen/recipes-tizen/rpm/rpm-native_git.bb | 12 ------------
 meta-tizen/recipes-tizen/rpm/rpm.inc           |  6 +++---
 meta-tizen/recipes-tizen/rpm/rpm_git.bb        |  1 +
 3 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 meta-tizen/recipes-tizen/rpm/rpm-native_git.bb

diff --git a/meta-tizen/recipes-tizen/rpm/rpm-native_git.bb b/meta-tizen/recipes-tizen/rpm/rpm-native_git.bb
deleted file mode 100644
index 48dcf58..0000000
--- a/meta-tizen/recipes-tizen/rpm/rpm-native_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require rpm.inc
-
-PRIORITY = "9"
-
-inherit native
-
-S = "${WORKDIR}/git"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/platform/upstream/rpm;protocol=ssh;tag=900e279b9481a75ede028707fe5a0a2bb2801a8f;nobranch=1"
-
diff --git a/meta-tizen/recipes-tizen/rpm/rpm.inc b/meta-tizen/recipes-tizen/rpm/rpm.inc
index 84cae76..8992400 100644
--- a/meta-tizen/recipes-tizen/rpm/rpm.inc
+++ b/meta-tizen/recipes-tizen/rpm/rpm.inc
@@ -74,7 +74,7 @@ DEPENDS += "file"
 DEPENDS += "popt"
 DEPENDS += "uthash"
 DEPENDS += "nss"
-DEPENDS += "gcc-cross"
+DEPENDS_build += "gcc-cross"
 DEPENDS += "elfutils"
 DEPENDS += "patch"
 DEPENDS += "lua"
@@ -176,7 +176,7 @@ do_install() {
 
  mkdir -p ${D}${prefix}/lib
  mkdir -p ${D}${prefix}/share/locale
- ln -s ../share/locale ${D}${prefix}/lib/locale
+ ln -sf ../share/locale ${D}${prefix}/lib/locale
 
    oe_runmake \
          DESTDIR=${D} \
@@ -199,7 +199,7 @@ do_install() {
  install -m 755 ${S}/packaging/find-provides.ksyms ${D}${prefix}/lib/rpm
  install -m 644 ${S}/packaging/device-sec-policy ${D}${sysconfdir}/device-sec-policy
  install -m 644 ${S}/packaging/device-sec-policy ${D}${prefix}/lib/rpm-plugins/msm-device-sec-policy
- ln -s ../tizen_macros ${D}${prefix}/lib/rpm/tizen/macros
+ ln -sf ../tizen_macros ${D}${prefix}/lib/rpm/tizen/macros
  for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do
    mkdir -p ${D}${prefix}/src/packages/$d
    chmod 755 ${D}${prefix}/src/packages/$d
diff --git a/meta-tizen/recipes-tizen/rpm/rpm_git.bb b/meta-tizen/recipes-tizen/rpm/rpm_git.bb
index 8c11fae..f657621 100644
--- a/meta-tizen/recipes-tizen/rpm/rpm_git.bb
+++ b/meta-tizen/recipes-tizen/rpm/rpm_git.bb
@@ -6,3 +6,4 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64
 
 SRC_URI += "git://review.tizen.org/platform/upstream/rpm;protocol=ssh;tag=900e279b9481a75ede028707fe5a0a2bb2801a8f;nobranch=1"
 
+BBCLASSEXTEND = "native"
\ No newline at end of file
-- 
2.7.4