X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=7b86db56135c7f64ef6c09c0cf19cb484a91a217;hb=e1da2d208abc2c0ce6d2aaa99bc1d9e92234d8ee;hp=0a89cb583faf88885a1d776aba99d1362b2a11d8;hpb=f22cdf1d0116e4fd6469b30dc19d64d35a95da67;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 0a89cb5..7b86db5 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,9 +1,9 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.35
+Version:    1.2.42
 Release:    1
 Group:      System/Libraries
-License:    Apache-2.0 and BSD-2-Clause and MIT
+License:    Apache-2.0 and BSD-3-Clause and MIT
 URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary
 Source0:    %{name}-%{version}.tar.gz
 
@@ -34,12 +34,14 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %define profile %{tizen_profile_name}
 %endif
 
-# tv
-# %define dali_style_folder 1920x1080
-
-# common
+%if "%{profile}" == "tv"
+%define dali_toolkit_profile TV
+%define dali_style_folder 1920x1080
+%else
+%define dali_toolkit_profile MOBILE
 %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
+%endif
 
 %if "%{?dali_style}"
   %define dali_style_folder %{dali_style}
@@ -49,15 +51,35 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
 user interface functionality.
 
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if tv ||"undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
-%package profile_tv
-Summary:    style files for Tizen TV (1920x1080)
+##############################
+# resource
+##############################
+%package resources_480x800
+Summary:    default resource files for 480x800
 Requires:   %{name} = %{version}-%{release}
-%description profile_tv
-dali-toolkit style files for Tizen TV (1920x1080)
-%endif
+Conflicts:  %{name}-resources_720x1280
+Conflicts:  %{name}-resources_1920x1080
+%description resources_480x800
+dali-toolkit default resource files for 480x800
+Contain po / sounds / common images / style / style images
+
+%package resources_720x1280
+Summary:    default resource files for 720x1280
+Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_480x800
+Conflicts:  %{name}-resources_1920x1080
+%description resources_720x1280
+dali-toolkit default resource files for 720x1280
+Contain po / sounds / common images / style / style images
+
+%package resources_1920x1080
+Summary:    default resource files for 1920x1080
+Requires:   %{name} = %{version}-%{release}
+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
 
 ##############################
 # devel
@@ -120,7 +142,7 @@ 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 \
+%configure --enable-profile=%{dali_toolkit_profile} \
            --with-style=%{dali_style_folder} \
 %if 0%{?enable_debug}
            --enable-debug \
@@ -137,7 +159,6 @@ rm -rf %{buildroot}
 pushd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
-
 # PO
 {
 cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
@@ -150,21 +171,20 @@ done
 } &> /dev/null
 popd
 
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if tv ||"undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "mobile" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+# Remove default style and style images which are for Linux build
+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}/480x800
+cp -r dali-toolkit/styles/480x800/* %{buildroot}%{dali_toolkit_style_files}/480x800
+mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280
+cp -r dali-toolkit/styles/720x1280/* %{buildroot}%{dali_toolkit_style_files}/720x1280
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
-# 720x1280/images/*.png files are exactly same with 1920x1080/images/*.png
-# if not, copy them as same as dali-toolkit/styles/1920x1080/*.json
-# cp dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
-cp dali-toolkit/styles/1920x1080/*.json %{buildroot}%{dali_toolkit_style_files}/1920x1080
+cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
 
-# Do not let style package files be overwritten by the main package
-#pushd %{buildroot}%{dali_toolkit_style_files}/1920x1080
-#for FILE in *.json; do rm -f ../"${FILE}"; done
-#popd
-
-%endif
+# Copy default feedback theme
+cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files}
 
 ##############################
 # Post Install
@@ -173,6 +193,44 @@ cp dali-toolkit/styles/1920x1080/*.json %{buildroot}%{dali_toolkit_style_files}/
 /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
+rm -rf ./*
+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
 ##############################
@@ -180,6 +238,21 @@ exit 0
 /sbin/ldconfig
 exit 0
 
+%postun resources_480x800
+pushd %{dali_toolkit_style_files}
+rm -rf 480x800
+popd
+
+%postun resources_720x1280
+pushd %{dali_toolkit_style_files}
+rm -rf 720x1280
+popd
+
+%postun resources_1920x1080
+pushd %{dali_toolkit_style_files}
+rm -rf 1920x1080
+popd
+
 ##############################
 # Files in Binary Packages
 ##############################
@@ -191,41 +264,36 @@ exit 0
 %endif
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so*
-%{dali_toolkit_image_files}/*
-%{dali_toolkit_sound_files}/*
-%{dali_toolkit_style_files}/*
-%exclude %{dali_toolkit_style_files}/1920x1080
-# 720x1280/images/*.png files are exactly same with 1920x1080/images/*.png
-%{_datadir}/license/%{name}
-%{_datadir}/locale/*/LC_MESSAGES/*
+%license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
 
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if tv ||"undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "mobile" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-%post profile_tv
-pushd %{dali_toolkit_style_files}/1920x1080
-for FILE in *.json; do mv 1920x1080/"${FILE}" ../"${FILE}"; done
-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/*
 
-%preun profile_tv
-case "$1" in
-  0)
-    # This is an un-installation.
-    pushd %{dali_toolkit_style_files}
-	for FILE in *.json; do mv 1920x1080/"${FILE}"; done
-	popd
-  ;;
-  1)
-    # This is an upgrade.
-    # Do nothing.
-    :
-  ;;
-esac
-%files profile_tv
+%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/*
+
+%files resources_1920x1080
+%manifest dali-toolkit-resources.manifest
+%defattr(-,root,root,-)
+%{dali_toolkit_image_files}/*
+%{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/1920x1080/*
-%endif
+%{dali_toolkit_style_files}/default-feedback-theme.json
+%{_datadir}/locale/*/LC_MESSAGES/*