X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=eb003755567ea874769bf6daeb158bf653465a69;hb=edcfb92968bbf87c003dfcf3e7057cdfb43155d3;hp=45963d3e6d112fd182b5e101e96ae5ea4c3bef9a;hpb=94e3579dbcbc4b7f7547ab54a0418fa3e58403fd;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 45963d3..eb00375 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.38
+Version:    1.2.46
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -34,17 +34,6 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %define profile %{tizen_profile_name}
 %endif
 
-# tv
-# %define dali_style_folder 1920x1080
-
-# common
-%define dali_style_folder 720x1280
-# dali_style to be provided by build system as with dali_toolkit_profile or by passing --define 'dali_style 470x800' to the rpm build command
-
-%if "%{?dali_style}"
-  %define dali_style_folder %{dali_style}
-%endif
-
 %description
 The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
 user interface functionality.
@@ -141,7 +130,6 @@ 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 \
-           --with-style=%{dali_style_folder} \
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
@@ -181,6 +169,28 @@ cp -r dali-toolkit/styles/720x1280/* %{buildroot}%{dali_toolkit_style_files}/720
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
 cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
 
+# Copy default feedback theme
+cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files}
+
+##############################
+# Pre Install
+##############################
+
+%pre resources_480x800
+pushd %{dali_toolkit_style_files}
+rm -rf ./*
+popd
+
+%pre resources_720x1280
+pushd %{dali_toolkit_style_files}
+rm -rf ./*
+popd
+
+%pre resources_1920x1080
+pushd %{dali_toolkit_style_files}
+rm -rf ./*
+popd
+
 ##############################
 # Post Install
 ##############################
@@ -188,6 +198,43 @@ cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/19
 /sbin/ldconfig
 exit 0
 
+%post resources_480x800
+pushd %{dali_toolkit_style_files}/480x800
+for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
+popd
+
+%post resources_720x1280
+pushd %{dali_toolkit_style_files}/720x1280
+for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
+popd
+
+%post resources_1920x1080
+pushd %{dali_toolkit_style_files}/1920x1080
+for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
+popd
+
+##############################
+# Pre Uninstall
+##############################
+
+%preun resources_480x800
+pushd %{dali_toolkit_style_files}
+mv images ./480x800
+mv *.json ./480x800
+popd
+
+%preun resources_720x1280
+pushd %{dali_toolkit_style_files}
+mv images ./720x1280
+mv *.json ./720x1280
+popd
+
+%preun resources_1920x1080
+pushd %{dali_toolkit_style_files}
+mv images ./1920x1080
+mv *.json ./1920x1080
+popd
+
 ##############################
 # Post Uninstall
 ##############################
@@ -195,6 +242,21 @@ exit 0
 /sbin/ldconfig
 exit 0
 
+%postun resources_480x800
+pushd %{dali_toolkit_style_files}
+rm -rf *
+popd
+
+%postun resources_720x1280
+pushd %{dali_toolkit_style_files}
+rm -rf *
+popd
+
+%postun resources_1920x1080
+pushd %{dali_toolkit_style_files}
+rm -rf *
+popd
+
 ##############################
 # Files in Binary Packages
 ##############################
@@ -213,75 +275,29 @@ exit 0
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
 
-%post resources_480x800
-pushd %{dali_toolkit_style_files}/480x800
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-popd
-
-%preun resources_480x800
-pushd %{dali_toolkit_style_files}
-mv images ./480x800
-mv *.json ./480x800
-popd
-
-%postun resources_480x800
-pushd %{dali_toolkit_style_files}
-rm -rf 480x800
-popd
-
 %files resources_480x800
 %manifest dali-toolkit-resources.manifest
 %defattr(-,root,root,-)
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/480x800/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
-%post resources_720x1280
-pushd %{dali_toolkit_style_files}/720x1280
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-rm -rf ./*
-popd
-
-%preun resources_720x1280
-pushd %{dali_toolkit_style_files}
-mv images ./720x1280
-mv *.json ./720x1280
-popd
-
-%postun resources_720x1280
-pushd %{dali_toolkit_style_files}
-rm -rf 720x1280
-popd
-
 %files resources_720x1280
 %manifest dali-toolkit-resources.manifest
 %defattr(-,root,root,-)
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/720x1280/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
-%post resources_1920x1080
-pushd %{dali_toolkit_style_files}/1920x1080
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-popd
-
-%preun resources_1920x1080
-pushd %{dali_toolkit_style_files}
-mv images ./1920x1080
-mv *.json ./1920x1080
-popd
-
-%postun resources_1920x1080
-pushd %{dali_toolkit_style_files}
-rm -rf 1920x1080
-popd
-
 %files resources_1920x1080
 %manifest dali-toolkit-resources.manifest
 %defattr(-,root,root,-)
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/1920x1080/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*