Merge branch 'tizen_3.0' into tizen

Change-Id: I68709d7f2f41ebfd0e92cc011dbc73ddba858eeb

diff --cc configure.ac
Simple merge

diff --cc packaging/isf.spec
index 9707970,e87c2fd..3870855
--- 1/packaging/isf.spec
--- 2/packaging/isf.spec
+++ b/packaging/isf.spec
@@@ -42,16 -40,15 +42,16 @@@ BuildRequires:  pkgconfig(capi-appfw-ap
  BuildRequires:  pkgconfig(cynara-client)
  BuildRequires:  pkgconfig(cynara-creds-socket)
  BuildRequires:  pkgconfig(cynara-session)
- BuildRequires:  capi-appfw-package-manager-devel
+ BuildRequires:  pkgconfig(capi-appfw-package-manager)
  Requires(postun): /sbin/ldconfig
 -%if "%{?profile}" == "mobile" || "%{?profile}" == "common"
 +Requires:     %{name}-compat = %{version}-%{release}
 +Recommends:   %{name}-profile_common = %{version}-%{release}
 +Requires:     org.tizen.isf-kbd-mode-changer
 +
 +# Mobile/Common ONLY
  BuildRequires:  pkgconfig(notification)
 -Requires: org.tizen.isf-kbd-mode-changer
 -%endif
 -%if "%{?profile}" == "tv"
 +# TV ONLY
  BuildRequires:  pkgconfig(libwebsockets)
 -%endif
  
  %define APP_PREFIX %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer/bin/