Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	build/tizen/adaptor/Makefile.am

Change-Id: Ide3266e4a0c8f9712baf42531666c22384c4a41e

diff --cc build/tizen/adaptor/Makefile.am
index a1fcf95,3646021..106b8c0
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -280,7 -265,7 +281,8 @@@ libdali_adaptor_la_LIBADD = 
                        $(LIBCURL_LIBS) \
                        $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                        $(CAPI_APPFW_APPLICATION_LIBS) \
 +                      $(HARFBUZZ_LIBS) \
+                       $(CAPI_SYSTEM_INFO_LIBS) \
                        -lgif \
                        -lboost_thread
  

diff --cc build/tizen/configure.ac
Simple merge

diff --cc packaging/dali-adaptor-mobile.spec
index 8142b4a,2922cc8..00351be
--- 1/packaging/dali-adaptor-mobile.spec
--- 2/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@@ -50,9 -50,11 +50,13 @@@ BuildRequires:  pkgconfig(libpng
  BuildRequires:  pkgconfig(opengl-es-20)
  BuildRequires:  pkgconfig(efl-assist)
  BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
+ %if 0%{?over_tizen_2_2}
+ BuildRequires:  pkgconfig(capi-system-info)
+ %endif
+ 
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)
  %endif

diff --cc packaging/dali-adaptor-tv.spec
Simple merge

diff --cc packaging/dali-adaptor-wearable.spec
Simple merge

diff --cc packaging/dali-adaptor.spec
Simple merge