Commit 9ed808d0c9227f8937b303625169033de6e7f882

Authored by Richard Huang
2 parents b1511367 7279bfb7

[dali_1.4.19] Merge branch 'devel/master'

Change-Id: I0b9d79db298bcbab6395fd94dd02f920877e9dfc
packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.4.18 5 +Version: 1.4.19
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
@@ -21,11 +21,7 @@ BuildRequires: gettext-tools @@ -21,11 +21,7 @@ BuildRequires: gettext-tools
21 BuildRequires: pkgconfig(dali-core) 21 BuildRequires: pkgconfig(dali-core)
22 BuildRequires: pkgconfig(dali-adaptor) 22 BuildRequires: pkgconfig(dali-adaptor)
23 BuildRequires: pkgconfig(dali-toolkit) 23 BuildRequires: pkgconfig(dali-toolkit)
24 -  
25 -#need libtzplatform-config for directory if tizen version is 3.x  
26 -%if 0%{?tizen_version_major} >= 3  
27 BuildRequires: pkgconfig(libtzplatform-config) 24 BuildRequires: pkgconfig(libtzplatform-config)
28 -%endif  
29 25
30 %description 26 %description
31 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations 27 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations
@@ -37,19 +33,10 @@ of the capability of the toolkit. @@ -37,19 +33,10 @@ of the capability of the toolkit.
37 %prep 33 %prep
38 %setup -q 34 %setup -q
39 35
40 -#Use TZ_PATH when tizen version is 3.x  
41 -  
42 -%if "%{tizen_version_major}" == "2"  
43 -%define dali_app_ro_dir /usr/apps/com.samsung.dali-demo/  
44 -%define dali_xml_file_dir /usr/share/packages/  
45 -%define dali_icon_dir /usr/share/icons/  
46 -%define smack_rule_dir /etc/smack/accesses2.d/  
47 -%else  
48 %define dali_app_ro_dir %TZ_SYS_RO_APP/com.samsung.dali-demo/ 36 %define dali_app_ro_dir %TZ_SYS_RO_APP/com.samsung.dali-demo/
49 %define dali_xml_file_dir %TZ_SYS_RO_PACKAGES 37 %define dali_xml_file_dir %TZ_SYS_RO_PACKAGES
50 %define dali_icon_dir %TZ_SYS_RO_ICONS 38 %define dali_icon_dir %TZ_SYS_RO_ICONS
51 %define smack_rule_dir %TZ_SYS_SMACK/accesses2.d/ 39 %define smack_rule_dir %TZ_SYS_SMACK/accesses2.d/
52 -%endif  
53 40
54 %define dali_app_res_dir %{dali_app_ro_dir}/res/ 41 %define dali_app_res_dir %{dali_app_ro_dir}/res/
55 %define dali_app_exe_dir %{dali_app_ro_dir}/bin/ 42 %define dali_app_exe_dir %{dali_app_ro_dir}/bin/