X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fcom.samsung.dali-demo.spec;h=4f312c2eb2b79e66626c6454c27260fe616f9aa4;hb=refs%2Fchanges%2F33%2F84733%2F1;hp=23a48dcdaa59f39e2d412c601cc550c15ca0b013;hpb=62d8230688564add861d39a2d3904e310ad86d50;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 23a48dc..4f312c2 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.1.26
+Version:    1.1.45
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -20,7 +20,11 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-toolkit)
+
+#need libtzplatform-config for directory if tizen version is 3.x
+%if "%{tizen_version_major}" == "3"
 BuildRequires:  pkgconfig(libtzplatform-config)
+%endif
 
 # DALi C++ applications always run on dali-adaptor.
 BuildRequires:  pkgconfig(dali-adaptor)
@@ -34,12 +38,22 @@ 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_app_exe_dir      %{dali_app_ro_dir}/bin/
 %define dali_xml_file_dir     %TZ_SYS_RO_PACKAGES
 %define dali_icon_dir         %TZ_SYS_RO_ICONS
-%define smack_rule_dir        /etc/smack/accesses2.d/
+%define smack_rule_dir        %TZ_SYS_SMACK/accesses2.d/
+%endif
 
+%define dali_app_exe_dir      %{dali_app_ro_dir}/bin/
 %define locale_dir            %{dali_app_ro_dir}/res/locale
 %define local_style_dir       ../../resources/style/mobile
 
@@ -49,13 +63,20 @@ of the capability of the toolkit.
 %build
 PREFIX="/usr"
 CXXFLAGS+=" -Wall -g -O2"
-LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC"
+LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed"
 
 %ifarch %{arm}
 CXXFLAGS+=" -D_ARCH_ARM_"
 %endif
 
-cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} -DLOCALE_DIR=%{locale_dir} -DLOCAL_STYLE_DIR=%{local_style_dir} .
+cd %{_builddir}/%{name}-%{version}/build/tizen
+
+cmake -DDALI_APP_DIR=%{dali_app_ro_dir} \
+      -DLOCALE_DIR=%{locale_dir} \
+%if 0%{?enable_debug}
+      -DCMAKE_BUILD_TYPE=Debug \
+%endif
+      -DLOCAL_STYLE_DIR=%{local_style_dir} .
 
 make %{?jobs:-j%jobs}
 
@@ -111,6 +132,7 @@ exit 0
 %{dali_app_exe_dir}/*.example
 %{dali_app_exe_dir}/dali-builder
 %{dali_app_ro_dir}/images/*
+%{dali_app_ro_dir}/videos/*
 %{dali_app_ro_dir}/models/*
 %{dali_app_ro_dir}/scripts/*
 %{dali_app_ro_dir}/style/*