X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-adaptor.spec;h=51d32c8c3d528b442256233f0eb9987d53508a6e;hb=d5270eae5a54f7aaf4928d1e8e02304c86a7e995;hp=473e17f13c1d711eec0f733348f17c97448dba91;hpb=a9bd7c2ab2f752ac19817c5030e95a9e4d20fed2;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 473e17f..58fa8a4 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali2-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    2.0.35
+Version:    2.1.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -36,9 +36,9 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
 BuildRequires:  pkgconfig(capi-appfw-watch-application)
 BuildRequires:  pkgconfig(appcore-watch)
-BuildRequires:  pkgconfig(screen_connector_provider)
 %endif
 
+BuildRequires:  pkgconfig(screen_connector_provider)
 BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(ttrace)
@@ -95,7 +95,7 @@ BuildRequires:  pkgconfig(ecore-wayland)
 BuildRequires:  pkgconfig(libtbm)
 
 # for the adaptor
-BuildRequires:  pkgconfig(appcore-ui)
+BuildRequires:  pkgconfig(app-core-ui-cpp)
 BuildRequires:  pkgconfig(appcore-widget-base)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(capi-appfw-app-common)
@@ -238,14 +238,7 @@ Requires:   %{name} = %{version}-%{release}
 %description dali2-feedback-plugin
 Feedback plugin to play haptic and audio feedback for Dali
 
-##############################
-# Preparation
-##############################
-%prep
-%setup -q
-
 #Use TZ_PATH when tizen version is 3.x or greater
-
 %define dali_data_rw_dir         %TZ_SYS_RO_SHARE/dali/
 %define dali_data_ro_dir         %TZ_SYS_RO_SHARE/dali/
 %define font_preloaded_path      %TZ_SYS_RO_SHARE/fonts/
@@ -257,6 +250,13 @@ Feedback plugin to play haptic and audio feedback for Dali
 %define dali_plugin_sound_files  /plugins/sounds/
 
 ##############################
+# Preparation
+##############################
+%prep
+%setup -q
+
+
+##############################
 # Build
 ##############################
 %build
@@ -270,7 +270,7 @@ CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
 
 CFLAGS+=" -DWAYLAND"
 CXXFLAGS+=" -DWAYLAND"
-cmake_flags=" -DENABLE_WAYLAND=ON -DENABLE_ATSPI=ON"
+cmake_flags=" -DENABLE_WAYLAND=ON -DENABLE_ATSPI=ON -DENABLE_TRACE=ON"
 
 # Use this conditional when Tizen version is 5.x or greater
 %if 0%{?tizen_version_major} >= 5
@@ -282,12 +282,17 @@ CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT"
 cmake_flags+=" -DENABLE_ECORE_WAYLAND2=ON"
 %endif
 
+# Use this conditional when Tizen version is 7.x or greater
+%if 0%{?tizen_version_major} >= 7
+CXXFLAGS+=" -DOVER_TIZEN_VERSION_7"
+%endif
+
 %if 0%{?enable_debug}
 cmake_flags+=" -DCMAKE_BUILD_TYPE=Debug"
 %endif
 
-%if 0%{?enable_trace}
-cmake_flags+=" -DENABLE_TRACE=ON"
+%if 0%{?enable_logging}
+cmake_flags+=" -DENABLE_NETWORK_LOGGING=ON"
 %endif
 
 libtoolize --force
@@ -317,7 +322,7 @@ cmake_flags+=" -DCOMPONENT_APPLICATION_SUPPORT=YES"
 # if mobile || "undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
 
-mkdir mobile
+mkdir -p mobile
 pushd mobile
 
 cmake -DENABLE_PROFILE=MOBILE $cmake_flags ..
@@ -333,7 +338,7 @@ popd
 # if tv ||"undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
 
-mkdir tv
+mkdir -p tv
 pushd tv
 
 cmake -DENABLE_PROFILE=TV $cmake_flags ..
@@ -349,7 +354,7 @@ popd
 # if wearable || "undefined"
 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
 
-mkdir wearable
+mkdir -p wearable
 pushd wearable
 
 cmake -DENABLE_PROFILE=WEARABLE $cmake_flags ..
@@ -365,7 +370,7 @@ popd
 # if ivi ||"undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
 
-mkdir ivi
+mkdir -p ivi
 pushd ivi
 
 cmake -DENABLE_PROFILE=IVI $cmake_flags ..
@@ -382,7 +387,7 @@ popd
 # if common ||"undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
 
-mkdir common
+mkdir -p common
 pushd common
 
 cmake -DENABLE_PROFILE=COMMON $cmake_flags ..