Merge changes I29462827,If8c3ac58 into devel/master

* changes:
  Fix incorrect IVI profile install command
  Enable AddonManager on Tizen Common profile as well

diff --git a/build/tizen/profiles/common-profile.cmake b/build/tizen/profiles/common-profile.cmake
index 2d24972..e1afc1e 100644 (file)
--- a/build/tizen/profiles/common-profile.cmake
+++ b/build/tizen/profiles/common-profile.cmake
@@ -41,7 +41,7 @@ SET( SOURCES
     ${adaptor_trace_common_src_files}
     ${adaptor_thread_common_src_files}
     ${adaptor_addons_common_src_files}
-    ${adaptor_addons_dummy_src_files}
+    ${adaptor_addons_tizen_src_files}
     ${devel_api_text_abstraction_src_files}
     ${static_libraries_glyphy_src_files}
     ${static_libraries_libunibreak_src_files}

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 316208d..d72774a 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -547,7 +547,7 @@ exit 0
 %post profile_ivi
 %if "%{?profile}" != "ivi"
 pushd %{_libdir}
-ln -sf libdali2-adaptor.so.ivi libdali2-adaptor.so.0.0.0
+ln -sf libdali2-adaptor.so.ivi libdali2-adaptor.so.2.0.0
 popd
 %endif
 /sbin/ldconfig