From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 22 Jul 2016 16:14:17 +0000 (-0700)
Subject: Merge "Tizen Directory Migration" into devel/master
X-Git-Tag: dali_1.1.45~15
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8a358acc76e2d526e5ce16a048592e7c944d6a7d;hp=-c

Merge "Tizen Directory Migration" into devel/master
---

8a358acc76e2d526e5ce16a048592e7c944d6a7d
diff --combined packaging/dali-toolkit.spec
index 5522f10,eb2312d..8188de1
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-toolkit
  Summary:    The OpenGLES Canvas Core Library Toolkit
 -Version:    1.1.43
 +Version:    1.1.44
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0 and BSD-2-Clause and MIT
@@@ -20,6 -20,12 +20,12 @@@ 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 -63,17 +63,17 @@@ 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/
+ %else
+ %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/