Revert "[Tizen] Remove profile build dependencies"

This reverts commit b6288ac0cc4ec207d47c78882b1f503f553e09a0.

Change-Id: I6d571bd182b48f61b6fbab63e6c69191ca5967b2

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index c1c6632..f12ab89 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -89,7 +89,7 @@ fi
 
 # Tizen Profile options
 AC_ARG_ENABLE([profile],
-              [AC_HELP_STRING([--enable-profile=UBUNTU,TIZEN],
+              [AC_HELP_STRING([--enable-profile=UBUNTU,MOBILE,WEARABLE,TV],
                             [Select the variant of tizen])],
               [dali_profile=$enableval],
               [dali_profile=UBUNTU])
@@ -99,10 +99,10 @@ AC_ARG_WITH(style,
               [AC_HELP_STRING([--with-style],
                             [Select the style folder to use])],
               [dali_style=$withval],
-              [dali_style=720x1280])
+              [dali_style=480x800])
 
 # Ensure valid profile selected
-if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xTIZEN"; then
+if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xMOBILE" -a "x$dali_profile" != "xWEARABLE" -a "x$dali_profile" != "xTV" ; then
   AC_MSG_ERROR([$enable_profile is an invalid profile])
 fi
 

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index d86b21a..7b86db5 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -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}
@@ -140,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 \