X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali.spec;h=e83925c314d31b2b347a5e5ccd2c88c6813b029a;hb=e76ed8c8769bd4ed75bce75d6130898b3269ae46;hp=1497d540607e1bd630861108908407e411340ae2;hpb=eb111ca352cf9eeace15373de76e5abb380bb945;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 1497d54..e83925c 100644
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    DALi 3D Engine
-Version:    1.3.45
+Version:    1.4.41
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -9,6 +9,7 @@ Source0:    %{name}-%{version}.tar.gz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
 
@@ -16,48 +17,9 @@ BuildRequires:  gawk
 BuildRequires:  pkgconfig(libtzplatform-config)
 %endif
 
-%if 0%{?tizen_version_major} < 4
-%define disable_cxx03_build 1
-%endif
-
 %description
 DALi 3D Engine
 
-%if !0%{?disable_cxx03_build}
-##############################
-# cxx03
-##############################
-%package cxx03
-Summary:	DALi 3D Engine with cxx03 abi
-Provides:	%{name}-cxx03 = %{version}-%{release}
-
-%description cxx03
-DALi 3D Engine with cxx03 abi with cxx03 abi
-
-##############################
-# devel-cxx03
-##############################
-%package devel-cxx03
-Summary:    Development components for DALi 3D Engine with cxx03 abi
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-Requires:   %{name}-integration-devel-cxx03 = %{version}-%{release}
-
-%description devel-cxx03
-Development components for DALi 3D Engine - public headers and package config
-
-##############################
-# integration-devel-cxx03
-##############################
-%package integration-devel-cxx03
-Summary:    Integration development package for DALi 3D Engine witch cxx03 abi
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-
-%description integration-devel-cxx03
-Integration development package for DALi 3D Engine - headers for integrating with an adaptor/platform abstraction library.
-%endif
-
 ##############################
 # devel
 ##############################
@@ -87,16 +49,6 @@ Integration development package for DALi 3D Engine - headers for integrating wit
 %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 dev_include_path %{_includedir}
 
 ##############################
@@ -118,84 +70,23 @@ LDFLAGS+=" --coverage "
 
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
-autoreconf --install
-DALI_DATA_RW_DIR="%{dali_data_rw_dir}"
-DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-export DALI_DATA_RW_DIR
-export DALI_DATA_RO_DIR
-
-# Default to GLES 2.0 if not specified.
-%{!?target_gles_version: %define target_gles_version 20}
 
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS;
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS;
 LDFLAGS="${LDFLAGS:-%optflags}" ; export LDFLAGS;
 
-./configure \
-      --program-prefix=%{?_program_prefix} \
-      --prefix=%{_prefix} \
-      --exec-prefix=%{_exec_prefix} \
-      --bindir=%{_bindir} \
-      --sbindir=%{_sbindir} \
-      --sysconfdir=%{_sysconfdir} \
-      --datadir=%{_datadir} \
-      --includedir=%{_includedir} \
-      --libdir=%{_libdir} \
-      --libexecdir=%{_libexecdir} \
-      --localstatedir=%{_localstatedir} \
-      --sharedstatedir=%{_sharedstatedir} \
-      --mandir=%{_mandir} \
-      --enable-gles=%{target_gles_version} \
-%if 0%{?enable_debug}
-      --enable-debug \
-%endif
-%if 0%{?enable_trace}
-      --enable-trace \
-%endif
-      --infodir=%{_infodir} \
-      --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-core-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-core.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-core.pc
-popd
-
-%if !0%{?disable_cxx03_build}
-make clean
-
-./configure \
-      --program-prefix=%{?_program_prefix} \
-      --prefix=%{_prefix} \
-      --exec-prefix=%{_exec_prefix} \
-      --bindir=%{_bindir} \
-      --sbindir=%{_sbindir} \
-      --sysconfdir=%{_sysconfdir} \
-      --datadir=%{_datadir} \
-      --includedir=%{_includedir} \
-      --libdir=%{_libdir} \
-      --libexecdir=%{_libexecdir} \
-      --localstatedir=%{_localstatedir} \
-      --sharedstatedir=%{_sharedstatedir} \
-      --mandir=%{_mandir} \
-      --enable-cxx03-abi=yes  \
-      --enable-gles=%{target_gles_version} \
+cmake \
 %if 0%{?enable_debug}
-      --enable-debug \
+      -DCMAKE_BUILD_TYPE=Debug \
 %endif
 %if 0%{?enable_trace}
-      --enable-trace \
+      -DENABLE_TRACE=ON \
 %endif
-      --infodir=%{_infodir} \
-      --enable-rename-so=no
+      -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+      -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+      -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}
 
 make %{?jobs:-j%jobs}
-%endif
 
 ##############################
 # Installation
@@ -205,25 +96,15 @@ rm -rf %{buildroot}
 cd build/tizen
 
 pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+%make_install
 
-for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
-mv dali-core.pc %{buildroot}%{_libdir}/pkgconfig/dali-core.pc
-popd
-
-#############################
-#rename
-#############################
+# Create links to ensure linking with cxx11 library is preserved
 pushd  %{buildroot}%{_libdir}
-rm -rf libdali-core.so
-rm -rf libdali-core-cxx11.so
-%if !0%{?disable_cxx03_build}
-ln -s libdali-core.so.0.0.* libdali-core-cxx03.so
-%endif
-ln -s libdali-core-cxx11.so.0.0.* libdali-core.so
+ln -sf libdali-core.so libdali-core-cxx11.so
+ln -sf libdali-core.so libdali-core-cxx11.so.0
+ln -sf libdali-core.so libdali-core-cxx11.so.0.0.0
 popd
 
-
 ##############################
 # Post Install
 ##############################
@@ -242,19 +123,6 @@ exit 0
 # Files in Binary Packages
 ##############################
 
-%if !0%{?disable_cxx03_build}
-%files cxx03
-%if 0%{?enable_dali_smack_rules}
-%manifest dali.manifest-smack
-%else
-%manifest dali.manifest
-%endif
-%defattr(-,root,root,-)
-%{_libdir}/libdali-core.so.*
-%{_libdir}/libdali-core-cxx03.so
-%license LICENSE
-%endif
-
 %files
 %if 0%{?enable_dali_smack_rules}
 %manifest dali.manifest-smack
@@ -262,23 +130,10 @@ exit 0
 %manifest dali.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-core-cxx11.so.*
-%{_libdir}/libdali-core.so
+%{_libdir}/libdali-core-cxx11.so*
+%{_libdir}/libdali-core.so*
 %license LICENSE
 
-%if !0%{?disable_cxx03_build}
-%files devel-cxx03
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/dali-core-cxx03.pc
-%{dev_include_path}/dali/public-api/*
-%{dev_include_path}/dali/devel-api/*
-%{dev_include_path}/dali/doc/*
-
-%files integration-devel-cxx03
-%defattr(-,root,root,-)
-%{_includedir}/dali/integration-api/*
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/dali-core.pc