From: Paul Wisbey Date: Thu, 9 Apr 2015 16:55:24 +0000 (+0100) Subject: Merge branch 'new_text' into tizen X-Git-Tag: dali_1.0.38~11 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7aa9e3d716396348b89c913b306bbc1ce201db69;hp=-c Merge branch 'new_text' into tizen Change-Id: Iecbf9000e282e0eda6240c4895f9d25a1bbb6c41 --- 7aa9e3d716396348b89c913b306bbc1ce201db69 diff --combined packaging/dali-toolkit.spec index e38d022,b0e9668..365d937 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@@ -7,6 -7,8 +7,6 @@@ License: Apache-2. URL: https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary Source0: %{name}-%{version}.tar.gz -%define dali_profile MOBILE - Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: dali @@@ -16,7 -18,6 +16,6 @@@ BuildRequires: pkgconfig(dlog BuildRequires: boost-devel BuildRequires: pkgconfig(dali) BuildRequires: pkgconfig(dali-core) - BuildRequires: fribidi-devel %description The OpenGLES Canvas Core Library Toolkit - a set of controls that provide @@@ -59,7 -60,7 +58,7 @@@ cd %{_builddir}/dali-toolkit-%{version} 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_profile} +%configure make %{?jobs:-j%jobs} ##############################