From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 4 Apr 2017 23:09:08 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/unified/20170406.054126^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6034d33b40103053748f8777be096cb5c7eed0df;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I038cc70fc5214a1c553ccf4f9d8b61eed70e1286
---

6034d33b40103053748f8777be096cb5c7eed0df
diff --cc packaging/org.tizen.inputmethod-setting.spec
index a61b995,a2a1b5a..c14c939
--- a/packaging/org.tizen.inputmethod-setting.spec
+++ b/packaging/org.tizen.inputmethod-setting.spec
@@@ -11,16 -12,11 +12,16 @@@ BuildRequires:  pkgconfig(capi-appfw-ap
  BuildRequires:  pkgconfig(isf)
  BuildRequires:  pkgconfig(elementary)
  BuildRequires:  pkgconfig(dlog)
- BuildRequires:  cmake
- BuildRequires:  efl-extension-devel
+ BuildRequires:  pkgconfig(efl-extension)
  BuildRequires:  pkgconfig(libtzplatform-config)
  BuildRequires:  pkgconfig(capi-ui-inputmethod-manager)
+ BuildRequires:  pkgconfig(capi-appfw-package-manager)
 -BuildRequires:  model-build-features
 +Requires:	%{name}-compat = %{version}-%{release}
 +# This if/endif is for GBM build optimization. This usage does not affect
 +# The unified build (profile is undefined) as it will return TRUE always.
 +%if "%{?profile}"!="mobile" && "%{?profile}"!="wearable"
 +Recommends:	%{name}-profile_common = %{version}-%{release}
 +%endif
  
  %description
  Setting Application for ISF.
@@@ -94,66 -29,23 +95,62 @@@ export CFLAGS="$CFLAGS -DTIZEN_ENGINEER
  export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE -DTIZEN_DEBUG_ENABLE -fvisibility=hidden -fvisibility-inlines-hidden"
  export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE -DTIZEN_DEBUG_ENABLE"
  
 -%if "%{?profile}" == "mobile"
 -CFLAGS+=" -D_MOBILE";
 -CXXFLAGS+=" -D_MOBILE";
 +export CFLAGSBASE="$CFLAGS"
 +export CXXFLAGSBASE="$CXXFLAGS"
 +
 +rm -rf CMakeFiles
 +rm -rf CMakeCache.txt
 +
 +# This if/endif is for GBM build optimization. This usage does not affect
 +# The unified build (profile is undefined) as it will return TRUE always.
 +%if "%{?profile}"!="tv" && "%{?profile}"!="wearable"
 +mkdir -p build_mobile
 +CFLAGS="$CFLAGSBASE -D_MOBILE"
 +CXXFLAGS="$CXXFLAGSBASE -D_MOBILE"
 +
 +pushd build_mobile
- cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-          -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
++%cmake .. -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
 +         -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
 +         -DTZ_SYS_RO_ICONS=%TZ_SYS_RO_ICONS
 +make %{?jobs:-j%jobs}
 +popd
  %endif
  
 -%if "%{?profile}" == "wearable"
 -CFLAGS+=" -D_WEARABLE";
 -CXXFLAGS+=" -D_WEARABLE";
 -%if "%{model_build_feature_formfactor}" == "circle"
 -CFLAGS+=" -D_CIRCLE";
 -CXXFLAGS+=" -D_CIRCLE";
 +# This if/endif is for GBM build optimization. This usage does not affect
 +# The unified build (profile is undefined) as it will return TRUE always.
 +%if "%{?profile}"!="tv" && "%{?profile}"!="mobile"
 +mkdir -p build_wearable_rectangle
 +
 +CFLAGS="$CFLAGSBASE -D_WEARABLE"
 +CXXFLAGS="$CXXFLAGSBASE -D_WEARABLE"
 +pushd build_wearable_rectangle
- cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-          -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
++%cmake .. -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
 +         -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
 +         -DTZ_SYS_RO_ICONS=%TZ_SYS_RO_ICONS
 +make %{?jobs:-j%jobs}
 +popd
 +
 +# Because circle breaks CAPI compatibility, it should be built for
 +# wearable and "unified (undefined)"
 +%if "%{?profile}"!="tv" && "%{?profile}"!="mobile" && "%{?profile}"!="ivi" && "%{?profile}"!="common"
 +mkdir -p build_wearable_circle
 +CFLAGS="$CFLAGSBASE -D_WEARABLE -D_CIRCLE"
 +CXXFLAGS="$CXXFLAGSBASE -D_WEARABLE -D_CIRCLE"
 +pushd build_wearable_circle
- cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-          -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
++%cmake .. -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
 +         -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
 +         -DTZ_SYS_RO_ICONS=%TZ_SYS_RO_ICONS
 +make %{?jobs:-j%jobs}
 +popd
  %endif
  %endif
  
 -rm -rf CMakeFiles
 -rm -rf CMakeCache.txt
 +# This if/endif is for GBM build optimization. This usage does not affect
 +# The unified build (profile is undefined) as it will return TRUE always.
 +%if "%{?profile}"!="mobile" && "%{?profile}"!="wearable"
 +CFLAGS="$CFLAGSBASE"
 +CXXFLAGS="$CXXFLAGSBASE"
- cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-         -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
+ %cmake . -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
          -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
          -DTZ_SYS_RO_ICONS=%TZ_SYS_RO_ICONS
  make %{?jobs:-j%jobs}