X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=019afcb3c4badb4a271c668b4873892095607dc1;hb=f9e905775bc997ed560bec1f40a61d8e1842911e;hp=aa92054e64b1e9134b68bd968cf02b1d42380359;hpb=ea4944fb18349baeed22eeee616de618787dceee;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index aa92054..019afcb 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.34
+Version:    1.2.39
 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,16 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %define profile %{tizen_profile_name}
 %endif
 
-# tv
-# %define dali_style_folder 1920x1080
-
-# common
+%if "%{profile}" == "mobile"
+%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 "%{profile}" == "tv"
+%define dali_toolkit_profile TV
+%define dali_style_folder 1920x1080
+%endif
 
 %if "%{?dali_style}"
   %define dali_style_folder %{dali_style}
@@ -49,16 +53,6 @@ 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)
-Requires:   %{name} = %{version}-%{release}
-%description profile_tv
-dali-toolkit style files for Tizen TV (1920x1080)
-%endif
-
 ##############################
 # devel
 ##############################
@@ -120,7 +114,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 \
@@ -134,12 +128,9 @@ make %{?jobs:-j%jobs}
 ##############################
 %install
 rm -rf %{buildroot}
-pushd build/tizen
+cd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
-# LICENSE
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name}
 
 # PO
 {
@@ -151,23 +142,6 @@ do
   cp ${language}.mo %{buildroot}/%{_datadir}/locale/${language}/LC_MESSAGES/dali-toolkit.mo
 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"
-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
-
-# 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
 
 ##############################
 # Post Install
@@ -197,36 +171,10 @@ exit 0
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/*
-%{_datadir}/license/%{name}
+%license LICENSE
 %{_datadir}/locale/*/LC_MESSAGES/*
 
 %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
-
-%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
-%{dali_toolkit_style_files}/1920x1080/*
-%endif