From: Ronan Le Martret <ronan@fridu.net>
Date: Mon, 26 May 2014 12:06:34 +0000 (+0200)
Subject: Fix merge
X-Git-Tag: rev_0.4~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f71f810e0b644c39568677573ea7266d8cecf348;p=scm%2Fbb%2Ftizen.git

Fix merge

Change-Id: I39926b229313a02f27ffc12f0e0a5a691fc972ae
---

f71f810e0b644c39568677573ea7266d8cecf348
diff --cc proto-meta-Tizen_generic/.spec2yoctorc
index d26e5d9,3d4cd8f..42f5f75
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@@ -187,9 -187,3 +187,10 @@@ libtapi=pkgconfig(tapi-3.0
  libsoup-2.4=pkgconfig(libsoup-2.4)
  json-glib=pkgconfig(json-glib-1.0)
  glib-2.0= pkgconfig(glib-2.0), pkgconfig(gmodule-2.0)
 +libgcrypt=libgcrypt-devel
 +util-linux=libblkid-devel
 +kmod=libkmod-devel
 +smack=smack-devel, pkgconfig(libsmack)
 +db=db4-devel
- coreutils=/usr/bin/install
++coreutils=/usr/bin/install
++