Merge branch 'tizen_2.2' into tizen

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

diff --cc packaging/osp-uix.spec
index 1c85ad2,443c9fa..683c5bb
mode 100755,100644..100755
--- 1/packaging/osp-uix.spec
--- 2/packaging/osp-uix.spec
+++ b/packaging/osp-uix.spec
@@@ -1,17 -1,20 +1,17 @@@
 -%define __strip /bin/true
 -
 -Name:         osp-uix
 -Summary:      osp uix library
 -Version:      1.2.2.0
 -Release:      2
 -Group:                System/Libraries
 -License:      TO_BE/FILLED_IN
 -Source0:      %{name}-%{version}.tar.gz
 +Name:           osp-uix
- Version:        1.2.1.0
++Version:        1.2.2.0
 +Release:        2
 +License:        Apache-2.0 or Flora
 +Summary:        OSP uix library
 +Group:          Graphics & UI Framework/Libraries
 +Source0:        %{name}-%{version}.tar.gz
  BuildRequires:  cmake
 -BuildRequires:  pkgconfig(sensor)
 +BuildRequires:  osp-appfw-internal-devel
  BuildRequires:  pkgconfig(capi-system-sensor)
  BuildRequires:  pkgconfig(osp-appfw)
 -BuildRequires:  osp-appfw-internal-devel
 +BuildRequires:  pkgconfig(sensor)
  
 -# runtime requires
 -Requires: osp-appfw 
 +Requires:       osp-appfw
  
  %description
  osp uix library