Fixed dependencies for building on other architectures

[problem]      Dali is exclusive to Arm architecture at the moment
[cause]        Broken dependencies on i586/x86_64 builds
[solution]     Fix the dependencies and remove exclusivity

Change-Id: I71ef589fb0591eaf3d5b40d1b1b2ae0515652417
Signed-off-by: David Steele <david.steele@partner.samsung.com>

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 673d510..54a27e4 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -15,11 +15,10 @@ Requires:       dali
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  boost-devel
-BuildRequires:  dali-devel
-BuildRequires:  dali-adaptor-devel
+BuildRequires:  pkgconfig(dali)
+BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  fribidi-devel
 BuildRequires:  pkgconfig(utilX)
-ExclusiveArch:  armv7l
 
 %description
 The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
@@ -75,9 +74,11 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
 libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/slp && autoreconf --install
-cd %{_builddir}/dali-toolkit-%{version}/build/slp && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ./configure --prefix=$PREFIX
-
+cd %{_builddir}/dali-toolkit-%{version}/build/slp
+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
 make %{?jobs:-j%jobs}
 
 ##############################