[Tizen] Remove profile build dependencies 58/132658/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:56:23 +0000 (14:56 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:56:25 +0000 (14:56 +0900)
This reverts commit 883f0a09d5d1c78ea002497299e6e25a5d4b998a.

Change-Id: I57ee4efc441d02853ce26b6aaab58d685bab10b9

build/tizen/configure.ac
packaging/dali-toolkit.spec

index f12ab89..c1c6632 100755 (executable)
@@ -89,7 +89,7 @@ fi
 
 # Tizen Profile options
 AC_ARG_ENABLE([profile],
-              [AC_HELP_STRING([--enable-profile=UBUNTU,MOBILE,WEARABLE,TV],
+              [AC_HELP_STRING([--enable-profile=UBUNTU,TIZEN],
                             [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=480x800])
+              [dali_style=720x1280])
 
 # Ensure valid profile selected
-if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xMOBILE" -a "x$dali_profile" != "xWEARABLE" -a "x$dali_profile" != "xTV" ; then
+if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xTIZEN"; then
   AC_MSG_ERROR([$enable_profile is an invalid profile])
 fi
 
index 7b86db5..d86b21a 100644 (file)
@@ -34,14 +34,12 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %define profile %{tizen_profile_name}
 %endif
 
-%if "%{profile}" == "tv"
-%define dali_toolkit_profile TV
-%define dali_style_folder 1920x1080
-%else
-%define dali_toolkit_profile MOBILE
+# 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
-%endif
 
 %if "%{?dali_style}"
   %define dali_style_folder %{dali_style}
@@ -142,7 +140,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=%{dali_toolkit_profile} \
+%configure --enable-profile=TIZEN \
            --with-style=%{dali_style_folder} \
 %if 0%{?enable_debug}
            --enable-debug \