X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=4796ce5772073ff4651bbaf7d52403119e6fc124;hp=358197cd193ea0cc883d0d8f8f5cbc948c4ed203;hb=c4ab3a9f3d6ee3b0149feccc78169fc5cb5da2ed;hpb=7ec8efc622e4c3131d6a9ae00cb8ea505d8b3923

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 358197c..bae4c89 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
-Name:       dali-toolkit
+Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.9.2
+Version:    2.0.16
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -12,13 +12,10 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(dali-core)
-BuildRequires:  pkgconfig(dali-adaptor)
+BuildRequires:  pkgconfig(dali2-core)
+BuildRequires:  pkgconfig(dali2-adaptor)
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
-Provides: libdali-toolkit-cxx11.so
-Provides: libdali-toolkit-cxx11.so.0
-Provides: libdali-toolkit-cxx11.so.0.0.0
 
 #############################
 # profile setup
@@ -83,6 +80,28 @@ Requires:   %{name} = %{version}-%{release}
 Application development package for Dali 3D engine toolkit - headers and package config
 
 ##############################
+# dali-scene-loader
+##############################
+%define dali2_scene_loader dali2-scene-loader
+%package -n %{dali2_scene_loader}
+Summary:    DLI scene loading library
+Group:      System/Libraries
+License:    Apache-2.0
+
+BuildRequires:  pkgconfig(dali2-toolkit)
+
+%description -n %{dali2_scene_loader}
+Provides functionality for loading and displaying DLI format scenes. See README.md for more details.
+
+%package -n %{dali2_scene_loader}-devel
+Summary:    Development components for dali-scene-loader
+Group:      Development/Building
+Requires:   %{dali2_scene_loader} = %{version}-%{release}
+
+%description -n %{dali2_scene_loader}-devel
+Development components for dali-scene-loader.
+
+##############################
 # Preparation
 ##############################
 %prep
@@ -96,9 +115,11 @@ Application development package for Dali 3D engine toolkit - headers and package
 %define dali_toolkit_style_files    %{dali_data_ro_dir}/toolkit/styles/
 %define dev_include_path %{_includedir}
 
+%define dali_xml_file_dir     %TZ_SYS_RO_PACKAGES
+
 # PO
 {
-cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
+cd %{_builddir}/dali2-toolkit-%{version}/dali-toolkit/po
 for language in *.po
 do
   language=${language%.po}
@@ -119,8 +140,12 @@ CXXFLAGS+=" --coverage "
 LDFLAGS+=" --coverage "
 %endif
 
+%ifarch %{arm}
+CXXFLAGS+=" -D_ARCH_ARM_"
+%endif
+
 libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
+cd %{_builddir}/dali2-toolkit-%{version}/build/tizen
 
 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
@@ -151,7 +176,7 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen
 
 # PO
 {
-cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
+cd %{_builddir}/dali2-toolkit-%{version}/dali-toolkit/po
 for language in *.mo
 do
   language=${language%.mo}
@@ -161,13 +186,6 @@ done
 } &> /dev/null
 popd
 
-# Create links to ensure linking with cxx11 library is preserved
-pushd  %{buildroot}%{_libdir}
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so.0
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so.0.0.0
-popd
-
 # Remove default style and style images which are for Linux build
 rm -rf %{buildroot}%{dali_toolkit_style_files}/*
 
@@ -355,14 +373,13 @@ esac
 %manifest dali-toolkit.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit-cxx11.so*
-%{_libdir}/libdali-toolkit.so*
+%{_libdir}/libdali2-toolkit.so*
 %license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
-%{_libdir}/pkgconfig/dali-toolkit.pc
+%{_libdir}/pkgconfig/dali2-toolkit.pc
 
 %files resources_360x360
 %manifest dali-toolkit-resources.manifest
@@ -399,3 +416,18 @@ esac
 %{dali_toolkit_style_files}/1920x1080/*
 %{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
+
+%files -n %{dali2_scene_loader}
+%if 0%{?enable_dali_smack_rules}
+%manifest dali-scene-loader.manifest-smack
+%else
+%manifest dali-scene-loader.manifest
+%endif
+%defattr(-,root,root,-)
+%{_libdir}/lib%{dali2_scene_loader}.so
+%license LICENSE
+
+%files -n %{dali2_scene_loader}-devel
+%defattr(-,root,root,-)
+%{_includedir}/dali-scene-loader/public-api/*
+%{_libdir}/pkgconfig/dali2-scene-loader.pc