X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=9380ce6a07b63c0e5599252533428a4fb16ca081;hp=d8b6dd4c4541fe26706d65a0f73d9ad93d4bdbd6;hb=07cc067f28642906f1bd521c16f58a1c84e9ed54;hpb=c7b9e9c65ace4c1210dabd95d0c2b71fb3c17e0b

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index d8b6dd4..9380ce6 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.4.10
+Version:    1.4.51
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -9,36 +9,21 @@ Source0:    %{name}-%{version}.tar.gz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-
-%if 0%{?tizen_version_major} < 4
-%define disable_cxx03_build 1
-%endif
-
+BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-adaptor)
-%if !0%{?disable_cxx03_build}
-BuildRequires:  pkgconfig(dali-core-cxx03)
-BuildRequires:  pkgconfig(dali-adaptor-cxx03)
-%endif
-BuildRequires: gettext
-
-
-#need libtzplatform-config for directory if tizen version is 3.x
-
-%if 0%{?tizen_version_major} >= 3
+BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
-%endif
+Provides: libdali-toolkit-cxx11.so
+Provides: libdali-toolkit-cxx11.so.0
+Provides: libdali-toolkit-cxx11.so.0.0.0
 
 #############################
 # profile setup
 #############################
 
-%if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
-%define profile %{tizen_profile_name}
-%endif
-
 %description
 Dali 3D engine Toolkit - a set of controls that provide
 user interface functionality.
@@ -86,15 +71,6 @@ Conflicts:  %{name}-resources_720x1280
 dali-toolkit default resource files for 1920x1080
 Contain po / sounds / common images / style / style images
 
-%if !0%{?disable_cxx03_build}
-%package cxx03
-Summary:	Dali 3D engine Toolkit with cxx03
-Provides:	%{name}-cxx03 = %{version}-%{release}
-
-%description cxx03
-Dali 3D engine Toolkit with cxx03
-%endif
-
 ##############################
 # devel
 ##############################
@@ -112,15 +88,8 @@ Application development package for Dali 3D engine toolkit - headers and package
 %prep
 %setup -q
 
-#Use TZ_PATH when tizen version is 3.x
-
-%if "%{tizen_version_major}" == "2"
-%define dali_data_rw_dir            /opt/usr/share/dali/
-%define dali_data_ro_dir            /usr/share/dali/
-%else
 %define dali_data_rw_dir            %TZ_SYS_SHARE/dali/
 %define dali_data_ro_dir            %TZ_SYS_RO_SHARE/dali/
-%endif
 
 %define dali_toolkit_image_files    %{dali_data_ro_dir}/toolkit/images/
 %define dali_toolkit_sound_files    %{dali_data_ro_dir}/toolkit/sounds/
@@ -152,65 +121,33 @@ LDFLAGS+=" --coverage "
 
 libtoolize --force
 cd %{_builddir}/dali-toolkit-%{version}/build/tizen
-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=TIZEN \
-%if 0%{?enable_debug}
-           --enable-debug \
-%endif
-%if 0%{?enable_trace}
-      --enable-trace \
-%endif
-           --enable-i18n=yes \
-           --enable-rename-so=no
-
-make %{?jobs:-j%jobs}
-
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
-
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-toolkit-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-toolkit.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-toolkit.pc
-popd
-
-%if !0%{?disable_cxx03_build}
-make clean
-
-libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
-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=TIZEN \
-           --enable-cxx03-abi=yes \
+cmake \
 %if 0%{?enable_debug}
-           --enable-debug \
+      -DCMAKE_BUILD_TYPE=Debug \
 %endif
 %if 0%{?enable_trace}
-      --enable-trace \
+      -DENABLE_TRACE=ON \
 %endif
-           --enable-i18n=yes \
-           --enable-rename-so=no
+      -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+      -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+      -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
+      -DENABLE_I18N=ON
 
 make %{?jobs:-j%jobs}
-%endif
 
 ##############################
 # Installation
 ##############################
 %install
 rm -rf %{buildroot}
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+cd build/tizen
 
-for FILE in libdali-toolkit-cxx11.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
-mv dali-toolkit.pc %{buildroot}%{_libdir}/pkgconfig/dali-toolkit.pc
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install
 
 # PO
 {
@@ -224,16 +161,11 @@ done
 } &> /dev/null
 popd
 
-#############################
-#rename
-#############################
+# Create links to ensure linking with cxx11 library is preserved
 pushd  %{buildroot}%{_libdir}
-rm -rf libdali-toolkit.so
-rm -rf libdali-toolkit-cxx11.so
-%if !0%{?disable_cxx03_build}
-ln -s libdali-toolkit.so.0.0.* libdali-toolkit-cxx03.so
-%endif
-ln -s libdali-toolkit-cxx11.so.0.0.* libdali-toolkit.so
+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
@@ -241,6 +173,7 @@ rm -rf %{buildroot}%{dali_toolkit_style_files}/*
 
 # Make folder to contain style and style images
 # After making folder, copy local style and style images to new folder
+pushd %{_builddir}/%{name}-%{version}
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/360x360
 cp -r dali-toolkit/styles/360x360/* %{buildroot}%{dali_toolkit_style_files}/360x360
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/480x800
@@ -252,6 +185,7 @@ cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/19
 
 # Copy default feedback theme
 cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files}
+popd
 
 ##############################
 # Pre Install
@@ -421,22 +355,9 @@ esac
 %manifest dali-toolkit.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit-cxx11.so.*
-%{_libdir}/libdali-toolkit.so
-%license LICENSE
-
-%if !0%{?disable_cxx03_build}
-%files cxx03
-%if 0%{?enable_dali_smack_rules}
-%manifest dali-toolkit.manifest-smack
-%else
-%manifest dali-toolkit.manifest
-%endif
-%defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit.so.*
-%{_libdir}/libdali-toolkit-cxx03.so
+%{_libdir}/libdali-toolkit-cxx11.so*
+%{_libdir}/libdali-toolkit.so*
 %license LICENSE
-%endif
 
 %files devel
 %defattr(-,root,root,-)