Merge branch 'devel/master' into tizen

Change-Id: I1e406dd468a6b55df1d7e8385dfe88e065f0c44f
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/adaptors/wearable/watch/watch-time.cpp b/adaptors/wearable/watch/watch-time.cpp
index df7b0f4..94377ad 100644 (file)
--- a/adaptors/wearable/watch/watch-time.cpp
+++ b/adaptors/wearable/watch/watch-time.cpp
@@ -20,8 +20,8 @@
 
 // EXTERNAL INCLUDES
 #ifdef APPCORE_WATCH_AVAILABLE
-#include <appcore-watch/watch_app.h>
-#include <appcore-watch/watch_app_extension.h>
+#include <watch_app.h>
+#include <watch_app_extension.h>
 #endif
 
 namespace Dali

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 052d4fa..7051a56 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -427,7 +427,6 @@ libdali_adaptor_la_LIBADD = \
                       $(HARFBUZZ_LIBS) \
                       $(TPKP_CURL_LIBS) \
                       $(UTILX_LIBS) \
-                      $(APPCORE_WATCH_LIBS) \
                       -lgif \
                       -lpthread \
                       -lturbojpeg \
@@ -496,6 +495,10 @@ if WEARABLE_PROFILE
 libdali_adaptor_la_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS)
+                      $(APPCORE_WATCH_CFLAGS)
+
+libdali_adaptor_la_LIBADD += \
+                      $(APPCORE_WATCH_LIBS)
 endif
 
 if TV_PROFILE

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 8c64580..61b42b8 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -27,7 +27,7 @@ Requires:       giflib
 
 #need libtzplatform-config for directory if tizen version is 3.x
 
-%if "%{tizen_version_major}" >= "3"
+%if 0%{?tizen_version_major} >= 3
 %define tizen_platform_config_supported 1
 BuildRequires:  pkgconfig(libtzplatform-config)
 %endif
@@ -52,7 +52,7 @@ BuildRequires:  pkgconfig(gles20)
 %define dali_profile TV
 %define dali_feedback_plugin 0
 %define dali_videoplayer_plugin 1
-%define shaderbincache_flag ENABLE
+%define shaderbincache_flag DISABLE
 BuildRequires:  pkgconfig(glesv2)
 %define gles_requirement_setup 1
 %endif
@@ -231,7 +231,7 @@ VideoPlayer plugin to play a video file for Dali
 
 #Use TZ_PATH when tizen version is 3.x or greater
 
-%if "%{tizen_version_major}" >= "3"
+%if 0%{?tizen_version_major} >= 3
 %define dali_data_rw_dir         %TZ_SYS_RO_SHARE/dali/
 %define dali_data_ro_dir         %TZ_SYS_RO_SHARE/dali/
 %define font_preloaded_path      %TZ_SYS_RO_SHARE/fonts/
@@ -329,9 +329,6 @@ rm -rf %{buildroot}
 cd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
-# LICENSE
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name}
 
 ##############################
 # Upgrade order:
@@ -405,7 +402,7 @@ exit 0
 %defattr(-,app,app,-)
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
-%{_datadir}/license/%{name}
+%license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -434,5 +431,6 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libdali-video-player-plugin.so*
+%license LICENSE
 %endif
 %endif