X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=2cc7dd72813d9fe0302f6e2a75ea414fcc618690;hp=8b2bb601c0ff0724ebc3a350141b399a769a8c1b;hb=e5d379064ba0e9a68d1d2680906952dbde263f34;hpb=8ab2d332de0eb2854d47b7729cd5ec25b73a1d06

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 8b2bb60..2cc7dd7 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.2.58
+Version:    1.4.19
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -10,40 +10,17 @@ Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%if 0%{?tizen_version_major} < 4
-%define disable_cxx03_build 1
-%endif
-
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali-core)
-%if !0%{?disable_cxx03_build}
-BuildRequires:  pkgconfig(dali-core-cxx03)
-%endif
-BuildRequires: gettext
-
-# dali-toolkit only need to know the interfaces(APIs) of dali-adaptor(the devel package).
-# It doesn't need to know which adaptor will be used by applications.
-# Applications or dali-addon will decide which one they will use.
-BuildRequires:  dali-adaptor-devel
-%if !0%{?disable_cxx03_build}
-BuildRequires:  dali-adaptor-devel-cxx03
-%endif
-
-#need libtzplatform-config for directory if tizen version is 3.x
-
-%if 0%{?tizen_version_major} >= 3
+BuildRequires:  pkgconfig(dali-adaptor)
+BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
-%endif
 
 #############################
 # profile setup
 #############################
 
-%if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
-%define profile %{tizen_profile_name}
-%endif
-
 %description
 Dali 3D engine Toolkit - a set of controls that provide
 user interface functionality.
@@ -51,9 +28,20 @@ user interface functionality.
 ##############################
 # resource
 ##############################
+%package resources_360x360
+Summary:    default resource files for 360x360
+Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_480x800
+Conflicts:  %{name}-resources_720x1280
+Conflicts:  %{name}-resources_1920x1080
+%description resources_360x360
+dali-toolkit default resource files for 360x360
+Contain po / sounds / common images / style / style images
+
 %package resources_480x800
 Summary:    default resource files for 480x800
 Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_720x1280
 Conflicts:  %{name}-resources_1920x1080
 %description resources_480x800
@@ -63,6 +51,7 @@ Contain po / sounds / common images / style / style images
 %package resources_720x1280
 Summary:    default resource files for 720x1280
 Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_480x800
 Conflicts:  %{name}-resources_1920x1080
 %description resources_720x1280
@@ -72,21 +61,13 @@ Contain po / sounds / common images / style / style images
 %package resources_1920x1080
 Summary:    default resource files for 1920x1080
 Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_480x800
 Conflicts:  %{name}-resources_720x1280
 %description resources_1920x1080
 dali-toolkit default resource files for 1920x1080
 Contain po / sounds / common images / style / style images
 
-%if !0%{?disable_cxx03_build}
-%package cxx03
-Summary:	Dali 3D engine Toolkit with cxx03
-Provides:	%{name}-cxx03 = %{version}-%{release}
-
-%description cxx03
-Dali 3D engine Toolkit with cxx03
-%endif
-
 ##############################
 # devel
 ##############################
@@ -104,15 +85,8 @@ Application development package for Dali 3D engine toolkit - headers and package
 %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/
@@ -152,6 +126,9 @@ DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?enable_trace}
+      --enable-trace \
+%endif
            --enable-i18n=yes \
            --enable-rename-so=no
 
@@ -166,27 +143,6 @@ for FILE in libdali-toolkit-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{ver
 mv pkgconfig/dali-toolkit.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-toolkit.pc
 popd
 
-%if !0%{?disable_cxx03_build}
-make clean
-
-libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
-autoreconf --install
-
-DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
-DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
-
-%configure --enable-profile=TIZEN \
-           --enable-cxx03-abi=yes \
-%if 0%{?enable_debug}
-           --enable-debug \
-%endif
-           --enable-i18n=yes \
-           --enable-rename-so=no
-
-make %{?jobs:-j%jobs}
-%endif
-
 ##############################
 # Installation
 ##############################
@@ -216,9 +172,6 @@ popd
 pushd  %{buildroot}%{_libdir}
 rm -rf libdali-toolkit.so
 rm -rf libdali-toolkit-cxx11.so
-%if !0%{?disable_cxx03_build}
-ln -s libdali-toolkit.so.0.0.* libdali-toolkit-cxx03.so
-%endif
 ln -s libdali-toolkit-cxx11.so.0.0.* libdali-toolkit.so
 popd
 
@@ -227,6 +180,8 @@ rm -rf %{buildroot}%{dali_toolkit_style_files}/*
 
 # Make folder to contain style and style images
 # After making folder, copy local style and style images to new folder
+mkdir -p %{buildroot}%{dali_toolkit_style_files}/360x360
+cp -r dali-toolkit/styles/360x360/* %{buildroot}%{dali_toolkit_style_files}/360x360
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/480x800
 cp -r dali-toolkit/styles/480x800/* %{buildroot}%{dali_toolkit_style_files}/480x800
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280
@@ -241,6 +196,15 @@ cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_st
 # Pre Install
 ##############################
 
+%pre resources_360x360
+case "$1" in
+  2)
+    pushd %{dali_toolkit_style_files}
+    rm -rf ./*
+    popd
+  ;;
+esac
+
 %pre resources_480x800
 case "$1" in
   2)
@@ -275,6 +239,11 @@ esac
 /sbin/ldconfig
 exit 0
 
+%post resources_360x360
+pushd %{dali_toolkit_style_files}/360x360
+for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
+popd
+
 %post resources_480x800
 pushd %{dali_toolkit_style_files}/480x800
 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
@@ -294,23 +263,49 @@ popd
 # Pre Uninstall
 ##############################
 
+%preun resources_360x360
+case "$1" in
+  0)
+    %preun resources_360x360
+    pushd %{dali_toolkit_style_files}
+    mv images ./360x360
+    mv dali-toolkit-default-theme.json ./360x360
+    popd
+  ;;
+esac
+
 %preun resources_480x800
-pushd %{dali_toolkit_style_files}
-mv images ./480x800
-mv dali-toolkit-default-theme.json ./480x800
-popd
+case "$1" in
+  0)
+    %preun resources_480x800
+    pushd %{dali_toolkit_style_files}
+    mv images ./480x800
+    mv dali-toolkit-default-theme.json ./480x800
+    popd
+  ;;
+esac
 
 %preun resources_720x1280
-pushd %{dali_toolkit_style_files}
-mv images ./720x1280
-mv dali-toolkit-default-theme.json ./720x1280
-popd
+case "$1" in
+  0)
+    %preun resources_720x1280
+    pushd %{dali_toolkit_style_files}
+    mv images ./720x1280
+    mv dali-toolkit-default-theme.json ./720x1280
+    popd
+  ;;
+esac
 
 %preun resources_1920x1080
-pushd %{dali_toolkit_style_files}
-mv images ./1920x1080
-mv dali-toolkit-default-theme.json ./1920x1080
-popd
+case "$1" in
+  0)
+    %preun resources_1920x1080
+    pushd %{dali_toolkit_style_files}
+    mv images ./1920x1080
+    mv dali-toolkit-default-theme.json ./1920x1080
+    popd
+  ;;
+esac
 
 ##############################
 # Post Uninstall
@@ -319,6 +314,15 @@ popd
 /sbin/ldconfig
 exit 0
 
+%postun resources_360x360
+case "$1" in
+  0)
+    pushd %{dali_toolkit_style_files}
+    rm -rf *
+    popd
+  ;;
+esac
+
 %postun resources_480x800
 case "$1" in
   0)
@@ -360,24 +364,20 @@ esac
 %{_libdir}/libdali-toolkit.so
 %license LICENSE
 
-%if !0%{?disable_cxx03_build}
-%files cxx03
-%if 0%{?enable_dali_smack_rules}
-%manifest dali-toolkit.manifest-smack
-%else
-%manifest dali-toolkit.manifest
-%endif
-%defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit.so.*
-%{_libdir}/libdali-toolkit-cxx03.so
-%license LICENSE
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
 %{_libdir}/pkgconfig/dali-toolkit.pc
 
+%files resources_360x360
+%manifest dali-toolkit-resources.manifest
+%defattr(-,root,root,-)
+%{dali_toolkit_image_files}/*
+%{dali_toolkit_sound_files}/*
+%{dali_toolkit_style_files}/360x360/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
+%{_datadir}/locale/*/LC_MESSAGES/*
+
 %files resources_480x800
 %manifest dali-toolkit-resources.manifest
 %defattr(-,root,root,-)