From: Denis Khalikov Date: Wed, 24 May 2017 15:27:08 +0000 (+0300) Subject: Change linkname. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa81f523930259ce0f345b38f52ee34014bf8b39;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Change linkname. libname.so -> libname_cxx11.so.*.*.* libnaame-cxx03.so -> libname.so.*.*.* Change-Id: Ie373398c59e96efeb542e66ea338fb3b2f866863 --- diff --git a/build/tizen/dali-toolkit-cxx03.pc.in b/build/tizen/dali-toolkit-cxx03.pc.in index 8f8cff5..f4812b0 100644 --- a/build/tizen/dali-toolkit-cxx03.pc.in +++ b/build/tizen/dali-toolkit-cxx03.pc.in @@ -8,5 +8,5 @@ Name: Samsung OpenGLES Toolkit (including Toolkit) Description: 3D Canvas Toolkit using OpenGLES (with the toolkit) Version: ${apiversion} Requires: dali-core-cxx03 -Libs: -L${libdir} -ldali-toolkit +Libs: -L${libdir} -ldali-toolkit-cxx03 Cflags: -I${includedir} diff --git a/build/tizen/dali-toolkit.pc.in b/build/tizen/dali-toolkit.pc.in index 1a1c164..87cbcc0 100644 --- a/build/tizen/dali-toolkit.pc.in +++ b/build/tizen/dali-toolkit.pc.in @@ -8,5 +8,5 @@ Name: Samsung OpenGLES Toolkit (including Toolkit) Description: 3D Canvas Toolkit using OpenGLES (with the toolkit) Version: ${apiversion} Requires: dali-core -Libs: -L${libdir} -ldali-toolkit_cxx11 +Libs: -L${libdir} -ldali-toolkit Cflags: -I${includedir} diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 9d8823f..dc763c9 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -211,6 +211,8 @@ pushd %{_builddir}/%{name}-%{version}/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 + + # PO { cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po @@ -223,6 +225,16 @@ done } &> /dev/null popd +############################# +#rename +############################# +pushd %{buildroot}%{_libdir} +rm -rf libdali-toolkit.so +rm -rf libdali-toolkit_cxx11.so +ln -s libdali-toolkit.so.0.0.* libdali-toolkit-cxx03.so +ln -s libdali-toolkit_cxx11.so.0.0.* libdali-toolkit.so +popd + # Remove default style and style images which are for Linux build rm -rf %{buildroot}%{dali_toolkit_style_files}/* @@ -259,7 +271,8 @@ exit 0 %manifest dali-toolkit.manifest %endif %defattr(-,root,root,-) -%{_libdir}/libdali-toolkit_cxx11.so* +%{_libdir}/libdali-toolkit_cxx11.so.* +%{_libdir}/libdali-toolkit.so %license LICENSE %files cxx03 @@ -269,7 +282,8 @@ exit 0 %manifest dali-toolkit.manifest %endif %defattr(-,root,root,-) -%{_libdir}/libdali-toolkit.so* +%{_libdir}/libdali-toolkit.so.* +%{_libdir}/libdali-toolkit-cxx03.so %license LICENSE %files devel