Merge "[3.0] Tizen Directory Migration" into tizen

diff --combined packaging/dali-toolkit.spec
index 04181b0,72a4a84..4507c4f
--- 1/packaging/dali-toolkit.spec
--- 2/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -20,6 -20,13 +20,13 @@@ BuildRequires: gettex
  # Applications or dali-addon will decide which one they will use.
  BuildRequires:  dali-adaptor-devel
  
+ #need libtzplatform-config for directory if tizen version is 3.x
+ 
+ %if "%{tizen_version_major}" == "3"
+ BuildRequires:  pkgconfig(libtzplatform-config)
+ %endif
+ 
+ 
  #############################
  # profile setup
  #############################
@@@ -57,8 -64,19 +64,19 @@@ Application development package for th
  ##############################
  %prep
  %setup -q
+ 
+ #Use TZ_PATH when tizen version is 3.x
+ 
+ %if "%{tizen_version_major}" == "2"
  %define dali_data_rw_dir            /opt/usr/share/dali/
  %define dali_data_ro_dir            /usr/share/dali/
+ %endif
+ 
+ %if "%{tizen_version_major}" == "3"
+ %define dali_data_rw_dir            %TZ_SYS_SHARE/dali/
+ %define dali_data_ro_dir            %TZ_SYS_RO_SHARE/dali/
+ %endif
+ 
  %define dali_toolkit_image_files    %{dali_data_ro_dir}/toolkit/images/
  %define dali_toolkit_sound_files    %{dali_data_ro_dir}/toolkit/sounds/
  %define dali_toolkit_style_files    %{dali_data_ro_dir}/toolkit/styles/
@@@ -82,11 -100,6 +100,11 @@@ PREFIX="/usr
  CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections "
  LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -Wl,-Bsymbolic-functions "
  
 +%if 0%{?enable_coverage}
 +CXXFLAGS+=" --coverage "
 +LDFLAGS+=" --coverage "
 +%endif
 +
  libtoolize --force
  cd %{_builddir}/dali-toolkit-%{version}/build/tizen
  autoreconf --install