Merge branch 'tizen_3.0' into tizen

Change-Id: I9e800b96f76b19213291a1737833587c3481f2ad

diff --combined packaging/org.tizen.inputdelegator.spec
index ddef11b,89c9cdf..6f10afb
--- 1/packaging/org.tizen.inputdelegator.spec
--- 2/packaging/org.tizen.inputdelegator.spec
+++ b/packaging/org.tizen.inputdelegator.spec
@@@ -1,15 -1,6 +1,15 @@@
 +# For the backward compatibility, this is to be built for
 +# wearable profile or 4.0 unified building environment.
 +# This cannot be built for non-wearable in conventional 3.0 build environment.
 +# Note that it is not a good idea to limit building with ExcludeArch because there are new architectures being tested.
 +# Use ExclusiveArch istead.
 +%if "%{?profile}" == "mobile" || "%{?profile}" == "tv" || "%{?profile}" == "ivi" || "%{?profile}" == "common"
 +ExclusiveArch:  none
 +%endif
 +
  Name: org.tizen.inputdelegator
  Summary: Input Delegator Application
- Version: 0.1.170216
+ Version: 0.1.170316
  Release: 1
  Group: Applications
  License: Apache-2.0
@@@ -25,12 -16,10 +25,12 @@@ BuildRequires:  pkgconfig(edbus
  
  BuildRequires: cmake
  BuildRequires: edje-bin
- BuildRequires: gettext
+ BuildRequires: gettext-tools
  
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(capi-appfw-application)
 +BuildRequires: pkgconfig(capi-appfw-app-control)
 +BuildRequires: pkgconfig(capi-appfw-preference)
  BuildRequires: pkgconfig(capi-media-wav-player)
  BuildRequires: pkgconfig(capi-system-device)
  BuildRequires: pkgconfig(eina)
@@@ -48,6 -37,22 +48,6 @@@ BuildRequires: pkgconfig(capi-media-aud
  BuildRequires:  pkgconfig(bundle)
  %endif
  
 -%if "%{?profile}" == "mobile"
 -ExcludeArch: %{arm} aarch64 %ix86 x86_64
 -%endif
 -
 -%if "%{?profile}" == "tv"
 -ExcludeArch: %{arm} aarch64 %ix86 x86_64
 -%endif
 -
 -%if "%{?profile}" == "common"
 -ExcludeArch: %{arm} aarch64 %ix86 x86_64
 -%endif
 -
 -%if "%{?profile}" == "ivi"
 -ExcludeArch: %{arm} aarch64 %ix86 x86_64
 -%endif
 -
  %define _appdir               /usr/apps
  %define _app_destdir  %{_appdir}/%{name}