From: Soo-Hyun Choi <sh9.choi@samsung.com>
Date: Tue, 1 Oct 2013 01:16:15 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen
X-Git-Tag: accepted/tizen/20131002.170114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20cb3c2f2618ecb6c175b7a477b4d6ebc6c24960;p=platform%2Fframework%2Fweb%2Fwrt-commons.git

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
---

bb3051d4e393aa7e071e66ddd2551b8cb0d445c0
diff --cc modules/security_origin_dao/CMakeLists.txt
index 3378073,f307a2b..dce86f5
--- a/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 packaging/wrt-commons.spec
index 6e4b6b4,e5f4354..3b3fee7
--- a/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