X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-adaptor.spec;h=ccbc20d078f58dffd7e9b178ebc76020b9661da8;hb=c58d24e6f5cbd8641565abb36d93074e732bf078;hp=f259109d189a496e2c177265d7bb814910c19e15;hpb=be59344fa3a77f4f694843cf36b4c87c36ea8727;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index f259109..ccbc20d 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.8
+Version:    2.1.4
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -61,6 +61,7 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  libcurl-devel
 BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  hyphen-devel
 BuildRequires:  fribidi-devel
 
 BuildRequires:  pkgconfig(capi-system-info)
@@ -70,6 +71,7 @@ BuildRequires:  pkgconfig(cairo)
 
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(input-method-client)
 BuildRequires:  wayland-devel
 BuildRequires:  wayland-extension-client-devel
 
@@ -110,6 +112,11 @@ BuildRequires:  pkgconfig(mm-sound)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(component-based-core-base)
 
+
+%if ( 0%{?tizen_version_major} == 6 && 0%{?tizen_version_minor} >= 5 ) || 0%{?tizen_version_major} >= 7
+BuildRequires:  pkgconfig(thorvg)
+%endif
+
 # for multiprofile
 Requires:   %{name}-compat = %{version}-%{release}
 Recommends: %{name}-profile_common = %{version}-%{release}
@@ -231,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/
@@ -250,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
@@ -263,7 +270,7 @@ CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
 
 CFLAGS+=" -DWAYLAND"
 CXXFLAGS+=" -DWAYLAND"
-cmake_flags=" -DENABLE_WAYLAND=ON -DENABLE_ATSPI=OFF"
+cmake_flags=" -DENABLE_WAYLAND=ON -DENABLE_ATSPI=ON"
 
 # Use this conditional when Tizen version is 5.x or greater
 %if 0%{?tizen_version_major} >= 5
@@ -283,6 +290,10 @@ cmake_flags+=" -DCMAKE_BUILD_TYPE=Debug"
 cmake_flags+=" -DENABLE_TRACE=ON"
 %endif
 
+%if 0%{?enable_logging}
+cmake_flags+=" -DENABLE_NETWORK_LOGGING=ON"
+%endif
+
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 
@@ -310,7 +321,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 ..
@@ -326,7 +337,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 ..
@@ -342,7 +353,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 ..
@@ -358,7 +369,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 ..
@@ -375,7 +386,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 ..