From: taeyoon <taeyoon0.lee@samsung.com>
Date: Tue, 9 Aug 2016 08:22:22 +0000 (+0900)
Subject: Revert "[3.0] Tizen Directory Migration"
X-Git-Tag: accepted/tizen/common/20160830.150403~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F83158%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[3.0] Tizen Directory Migration"

This reverts commit e1cc68e173567097a4313086c4cb62f804799182.

Change-Id: I10a4a79448361c26d57005b60848f5afa90d7c51
---

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 689e5a4..890a3c6 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -25,12 +25,6 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires:       giflib
 
-#need libtzplatform-config for directory if tizen version is 3.x
-
-%if "%{tizen_version_major}" == "3"
-BuildRequires:  pkgconfig(libtzplatform-config)
-%endif
-
 # Get the profile from tizen_profile_name if tizen version is 2.x and tizen_profile_name exists.
 
 %if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
@@ -225,29 +219,15 @@ VideoPlayer plugin to play a video file for Dali
 ##############################
 %prep
 %setup -q
-
-#Use TZ_PATH when tizen version is 3.x
-
-%if "%{tizen_version_major}" == "2"
 %define dali_data_rw_dir         /usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
+%define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
 %define font_application_path    /usr/share/app_fonts/
 %define font_configuration_file  /opt/etc/fonts/conf.avail/99-slp.conf
-%endif
-
-%if "%{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/
-%define font_downloaded_path     %TZ_SYS_SHARE/fonts/
-%define font_application_path    %TZ_SYS_RO_SHARE/app_fonts/
-%define font_configuration_file  %TZ_SYS_ETC/fonts/conf.avail/99-slp.conf
-%endif
-
-%define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define dali_plugin_sound_files  %{dali_data_ro_dir}/plugins/sounds/
+
 %define dev_include_path %{_includedir}
 
 ##############################