From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Fri, 13 Jan 2017 00:52:49 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170113.082510^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=801a0a72f00181e2c65a13c8a5f26990d7416cd3;p=platform%2Fcore%2Fuifw%2Flibscl-core.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I3a9a176bdc68d0c435aed1d7ed274c448d8718c9
---

801a0a72f00181e2c65a13c8a5f26990d7416cd3
diff --cc packaging/libscl-core.spec
index 59d0cc3,1683729..e206072
--- a/packaging/libscl-core.spec
+++ b/packaging/libscl-core.spec
@@@ -1,9 -1,15 +1,9 @@@
  %bcond_with x
  %bcond_with wayland
  
 -%if "%{?profile}" == "wearable"
 -%define WITH_WEBSOCKET TRUE
 -%else
 -%define WITH_WEBSOCKET FALSE
 -%endif
 -
  Name:       libscl-core
  Summary:    A library for developing software keyboards
- Version:    0.4.33
+ Version:    0.4.35
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0
@@@ -22,10 -28,9 +22,11 @@@ BuildRequires:  pkgconfig(ecore-x
  BuildRequires:  pkgconfig(x11)
  %endif
  BuildRequires:  pkgconfig(libscl-common)
+ BuildRequires:  pkgconfig(appcore-efl)
  BuildRequires:  pkgconfig(capi-appfw-application)
 -%if "%{WITH_WEBSOCKET}" == "TRUE"
 +# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 +# if wearable || "undefined"
 +%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
  BuildRequires:  pkgconfig(libwebsockets)
  %endif