Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

[Note] Backporting Tizen RSA wrt-commons

Conflicts:
	build/encryption/CMakeLists.txt
	build/i18n/wrt-commons-i18n-dao-ro.pc.in
	packaging/wrt-commons.spec
	wrt-commons.manifest

Change-Id: Idc88e4636917b534d004b398f2489e516f9d66e8

diff --cc CMakeLists.txt
Simple merge

diff --cc build/test/CMakeLists.txt
Simple merge

diff --cc build/test/dpl-test-efl.pc.in
Simple merge

diff --cc etc/wrt_commons_create_clean_db.sh
Simple merge

diff --cc modules/db/include/dpl/db/thread_database_support.h
Simple merge

diff --cc modules/security_origin_dao/CMakeLists.txt
index 337807372a44668033a051cbcc4062c1464c2455,f307a2b802da5f0125060dc3431fe7d828267168..dce86f5a7a485e59f2a764fbdccdbeb027fad2e4
--- 1/modules/security_origin_dao/CMakeLists.txt
--- 2/modules/security_origin_dao/CMakeLists.txt
+++ b/modules/security_origin_dao/CMakeLists.txt
@@@ -43,10 -42,10 +42,10 @@@ INCLUDE_DIRECTORIES(${SECURITY_ORIGIN_D
  
  ADD_LIBRARY(${TARGET_SECURITY_ORIGIN_DAO_LIB} SHARED ${SECURITY_ORIGIN_DAO_SOURCES})
  SET_TARGET_PROPERTIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} PROPERTIES SOVERSION ${API_VERSION} VERSION ${VERSION})
- TARGET_LINK_LIBRARIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} ${TARGET_DPL_EFL} ${TARGET_DPL_DB_EFL} ${TARGET_WRT_DAP_RO_LIB} ${SECURITY_ORIGIN_DAO_DEPS_LIBRARIES})
+ TARGET_LINK_LIBRARIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} ${TARGET_DPL_EFL} ${TARGET_DPL_DB_EFL} ${TARGET_WRT_DAO_RO_LIB} ${SECURITY_ORIGIN_DAO_DEPS_LIBRARIES})
  ADD_DEPENDENCIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} ${TARGET_SECURITY_ORIGIN_DAO_DB})
  
 -INSTALL(TARGETS ${TARGET_SECURITY_ORIGIN_DAO_LIB} DESTINATION lib)
 +INSTALL(TARGETS ${TARGET_SECURITY_ORIGIN_DAO_LIB} DESTINATION ${LIB_INSTALL_DIR})
  
  INSTALL(FILES
      include/wrt-commons/security-origin-dao/security_origin_dao_types.h

diff --cc modules/widget_dao/CMakeLists.txt
Simple merge

diff --cc modules/widget_dao/dao/widget_dao_read_only.cpp
Simple merge

diff --cc modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
Simple merge

diff --cc packaging/wrt-commons.spec
index 6e4b6b4f9a52cd2674910976c02bd7d9bb6abe9f,e5f4354ceb7cadc1833d90e0837ee4ed87226eda..3b3fee772fcfc6f918cb36faffea9f8f5668d10a
--- 1/packaging/wrt-commons.spec
--- 2/packaging/wrt-commons.spec
+++ b/packaging/wrt-commons.spec
@@@ -1,11 -1,12 +1,11 @@@
 -#git:framework/web/wrt-commons
  Name:       wrt-commons
  Summary:    Wrt common library
- Version:    0.2.119
+ Version:    0.2.153
  Release:    1
 -Group:      Development/Libraries
 -License:    Apache License, Version 2.0
 -URL:        N/A
 +Group:      System/Libraries
 +License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
 +Source1001:   wrt-commons.manifest
  BuildRequires:  cmake
  BuildRequires:  pkgconfig(ecore)
  BuildRequires:  pkgconfig(appcore-efl)
@@@ -49,21 -44,37 +44,37 @@@ cp %{SOURCE1001} 
      %define with_tests 1
  %endif
  
+ %define with_child 0
+ %if "%{WITH_CHILD}" == "ON" || "%{WITH_CHILD}" == "Y" || "%{WITH_CHILD}" == "YES" || "%{WITH_CHILD}" == "TRUE" || "%{WITH_CHILD}" == "1"
+     %define with_child 1
+ %endif
+ 
  %build
- %cmake . -DVERSION=%{version} \
+ %if 0%{?tizen_build_binary_release_type_eng}
+ export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
+ export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
+ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
+ %endif
+ 
+ export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed"
+ 
+ cmake . -DVERSION=%{version} \
          -DDPL_LOG="OFF"      \
 -        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
-         %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
+         %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS} \
+         %{?WITH_CHILD:-DWITH_CHILD=%WITH_CHILD}
  make %{?jobs:-j%jobs}
  
  %install
+ mkdir -p %{buildroot}/usr/share/license
+ cp LICENSE %{buildroot}/usr/share/license/%{name}
  %make_install
  
 -%clean
 -rm -rf %{buildroot}
  
 -%post
 +%postun -p /sbin/ldconfig
 +
 +%post 
 +/sbin/ldconfig
  mkdir -p /opt/share/widget/system
  mkdir -p /opt/share/widget/user
  mkdir -p /opt/share/widget/exec