X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fcom.samsung.dali-demo.spec;h=0e3b31d4bf42334a497c68f31b1651df254c11fe;hb=af385f0fb32a95a5405f1794a5b744a95841c6cb;hp=682f0ed8b9f744e5e3f2b6bc45a248cc703768f6;hpb=b1a9dcaa325803596097a5540748eccb78b20166;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 682f0ed..0e3b31d 100755
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.4.10
+Version:    1.9.4
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -21,11 +21,7 @@ BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-adaptor)
 BuildRequires:  pkgconfig(dali-toolkit)
-
-#need libtzplatform-config for directory if tizen version is 3.x
-%if 0%{?tizen_version_major} >= 3
 BuildRequires:  pkgconfig(libtzplatform-config)
-%endif
 
 %description
 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations
@@ -37,19 +33,10 @@ of the capability of the toolkit.
 %prep
 %setup -q
 
-#Use TZ_PATH when tizen version is 3.x
-
-%if "%{tizen_version_major}" == "2"
-%define dali_app_ro_dir       /usr/apps/com.samsung.dali-demo/
-%define dali_xml_file_dir     /usr/share/packages/
-%define dali_icon_dir         /usr/share/icons/
-%define smack_rule_dir        /etc/smack/accesses2.d/
-%else
 %define dali_app_ro_dir       %TZ_SYS_RO_APP/com.samsung.dali-demo/
 %define dali_xml_file_dir     %TZ_SYS_RO_PACKAGES
 %define dali_icon_dir         %TZ_SYS_RO_ICONS
 %define smack_rule_dir        %TZ_SYS_SMACK/accesses2.d/
-%endif
 
 %define dali_app_res_dir      %{dali_app_ro_dir}/res/
 %define dali_app_exe_dir      %{dali_app_ro_dir}/bin/
@@ -70,7 +57,7 @@ CXXFLAGS+=" -D_ARCH_ARM_"
 
 cd %{_builddir}/%{name}-%{version}/build/tizen
 
-cmake -DDALI_APP_DIR=%{dali_app_ro_dir} \
+cmake -DDALI_APP_DIR=%{dali_app_ro_dir}/bin \
       -DLOCALE_DIR=%{locale_dir} \
       -DDALI_APP_RES_DIR=%{dali_app_res_dir} \
 %if 0%{?enable_debug}
@@ -88,7 +75,7 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 cd build/tizen
-%make_install DALI_APP_DIR=%{dali_app_ro_dir}
+%make_install DALI_APP_DIR=%{dali_app_ro_dir}/bin
 %make_install DDALI_APP_RES_DIR=%{dali_app_res_dir}
 
 mkdir -p %{buildroot}%{dali_xml_file_dir}