Merge branch 'tizen_2.2' into tizen

Change-Id: Id9ef7ba984eb4db5146730e9611f298f8f28c8f6
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --cc packaging/osp-json.spec
index d3731ff,baf69fa..a570f36
--- 1/packaging/osp-json.spec
--- 2/packaging/osp-json.spec
+++ b/packaging/osp-json.spec
@@@ -1,21 -1,26 +1,21 @@@
 -%define __strip /bin/true
 -
 -Name:         osp-json
 -Summary:      osp json library
 -Version:      1.2.2.0
 -Release:      2
 -Group:                System/Libraries
 -License:      TO_BE/FILLED_IN
 -Source0:      %{name}-%{version}.tar.gz
 +Name:           osp-json
- Version:        1.2.1.0
++Version:        1.2.2.0
 +Release:        2
 +License:        Apache-2.0
 +Summary:        OSP JSON Library
 +Group:          System/Libraries
 +Source0:        %{name}-%{version}.tar.gz
  BuildRequires:  cmake
 -BuildRequires:  pkgconfig(osp-appfw)
  BuildRequires:  osp-appfw-internal-devel
 -
 -# runtime requires
 -Requires: osp-appfw 
 +BuildRequires:  pkgconfig(osp-appfw)
 +Requires:       osp-appfw
  
  %description
 -osp json library
 +OSP json library
  
  %package devel
 -Summary:    osp json library (Development)
 -Group:      TO_BE/FILLED_IN
 -Requires:   %{name} = %{version}-%{release}
 +Summary:        osp json library (Development)
 +Requires:       %{name} = %{version}
  
  %description devel
  osp json library (DEV)