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

Conflicts:
	packaging/wrt-plugins-tizen.spec
	pkgconfigs/wrt-plugins-tizen-application.pc.in
	pkgconfigs/wrt-plugins-tizen-contact.pc.in
	pkgconfigs/wrt-plugins-tizen-filesystem.pc.in
	src/Systeminfo/CMakeLists.txt

Change-Id: Ie43336986fbe271293ae327031601d7cfde47e35

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/wrt-plugins-tizen.spec
index 68f7fe1,3a2f344..2de4ea8
--- 1/packaging/wrt-plugins-tizen.spec
--- 2/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@@ -1,16 -1,7 +1,16 @@@
 +%bcond_with wrt_option_bluetooth
 +%bcond_with wrt_option_call_history
 +%bcond_with wrt_option_nbs
 +%bcond_with wrt_option_nfc
 +%bcond_with wrt_option_push
 +%bcond_with wrt_option_se
 +%bcond_with wrt_option_sysinfo_tel_sim_mngt
 +%bcond_with wrt_option_sysinfo_cellular_network_mngt
 +%bcond_with wrt_option_msg_port
  Name:       wrt-plugins-tizen
  Summary:    JavaScript plugins for WebRuntime
- Version:    0.4.32
+ Version:    0.4.72
 -Release:    0
 +Release:    3
  Group:      Development/Libraries
  License:    Apache License, Version 2.0
  Source0:    %{name}-%{version}.tar.gz
@@@ -73,15 -56,12 +73,16 @@@ BuildRequires:  pkgconfig(pkgmgr
  BuildRequires:  pkgconfig(pkgmgr-info)
  BuildRequires:  pkgconfig(capi-appfw-package-manager)
  BuildRequires:  pkgconfig(capi-web-url-download)
 +%if %{with wrt_option_push}
  BuildRequires:  pkgconfig(push)
 +%endif
  BuildRequires:  pkgconfig(notification)
 +%if %{with wrt_option_msg_port}
  BuildRequires:  pkgconfig(message-port)
 +%endif
  BuildRequires:  pkgconfig(sync-agent)
  BuildRequires:  pkgconfig(security-server)
+ BuildRequires:  pkgconfig(wrt-plugins-ipc-message)
  BuildRequires:  expat-devel
  BuildRequires:  cmake
  BuildRequires:  gettext-devel
@@@ -110,34 -90,19 +111,40 @@@ Wrt-plugin-tizen development header
  
  export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
  
 -cmake \
 --DENABLE_OPTIONAL_BT=YES \
 --DENABLE_OPTIONAL_CALL_HISTORY=YES \
 --DENABLE_OPTIONAL_NBS=YES \
 --DENABLE_OPTIONAL_NFC=YES \
 --DENABLE_OPTIONAL_PUSH=YES \
 --DENABLE_OPTIONAL_SE=YES \
+ %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
+ 
 +%cmake \
 +%if %{with wrt_option_bluetooth}
 +    -DENABLE_OPTIONAL_BT=YES \
 +%endif
 +%if %{with wrt_option_call_history}
 +    -DENABLE_OPTIONAL_CALL_HISTORY=YES \
 +%endif
 +%if %{with wrt_option_nbs}
 +    -DENABLE_OPTIONAL_NBS=YES \
 +%endif
 +%if %{with wrt_option_nfc}
 +    -DENABLE_OPTIONAL_NFC=YES \
 +%endif
 +%if %{with wrt_option_push}
 +    -DENABLE_OPTIONAL_PUSH=YES \
 +%endif
 +%if %{with wrt_option_se}
 +    -DENABLE_OPTIONAL_SE=YES \
 +%endif
 +%if %{with wrt_option_sysinfo_tel_sim_mngt}
 +    -DENABLE_OPTIONAL_SYSINFO_TEL_SIM_MNGT=YES \
 +%endif
 +%if %{with wrt_option_sysinfo_cellular_network_mngt}
 +    -DENABLE_OPTIONAL_SYSINFO_CELLULAR_NETWORK_MNGT=YES \
 +%endif
 +%if %{with wrt_option_msg_port}
 +    -DENABLE_OPTIONAL_MSG_PORT=YES \
 +%endif
  . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DDPL_LOG="ON" -DENABLE_TIME_TRACER="OFF"
  
  make %{?jobs:-j%jobs}
@@@ -145,16 -110,19 +152,19 @@@
  %install
  rm -rf %{buildroot}
  %make_install
+ mkdir -p %{buildroot}/usr/share/license
+ cp LICENSE %{buildroot}/usr/share/license/%{name}
  
 -%post
 -
 -%postun
 +%post -p  /sbin/ldconfig
  
 +%postun -p /sbin/ldconfig
  
  %files
  %manifest wrt-plugins-tizen.manifest 
  %{_libdir}/wrt-plugins/*
  /usr/etc/tizen-apis/*
 +/etc/ld.so.conf.d/wrt-plugins-tizen.conf
+ /usr/share/license/%{name}
  
  %files devel
  %{_includedir}/*

diff --cc pkgconfigs/wrt-plugins-tizen-application.pc.in
index 60cc46f,4558d9b..d67768c
--- 1/pkgconfigs/wrt-plugins-tizen-application.pc.in
--- 2/pkgconfigs/wrt-plugins-tizen-application.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-application.pc.in
@@@ -9,5 -9,5 +9,5 @@@ Name: wrt-plugins-tizen-${module_name
  Description: wrt-plugins-tizen-${module_name}
  Version: @CMAKE_PROJECT_VERSION@
  Requires: capi-appfw-app-manager capi-appfw-application capi-appfw-package-manager pkgmgr pkgmgr-info
- Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
+ Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
 -Cflags: -I${includedir}/${module_name}
 +Cflags: -I${includedir}/${module_name}

diff --cc pkgconfigs/wrt-plugins-tizen-contact.pc.in
index 6116b8c,2612c20..7377b7f
--- 1/pkgconfigs/wrt-plugins-tizen-contact.pc.in
--- 2/pkgconfigs/wrt-plugins-tizen-contact.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-contact.pc.in
@@@ -9,5 -9,5 +9,5 @@@ Name: wrt-plugins-tizen-${module_name
  Description: wrt-plugins-tizen-${module_name}
  Version: @CMAKE_PROJECT_VERSION@
  Requires: contacts-service2 libpcrecpp
- Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
+ Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
 -Cflags: -I${includedir}/${module_name}
 +Cflags: -I${includedir}/${module_name}

diff --cc src/Application/ApplicationManager.h
Simple merge

diff --cc src/CMakeLists.txt
index d8ef402,d6f2871..7b3a58e
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -49,12 -49,11 +49,11 @@@ add_plugin
        Application
        Messaging
        Callhistory
 -      Systeminfo
 +      #Systeminfo
        NFC
-       Log
        Filesystem
        Alarm
 -      Power
 +      #Power
        Notification
        Download
        NetworkBearerSelection

diff --cc src/Systeminfo/CMakeLists.txt
index d8e3661,4ff3261..f336da6
--- 1/src/Systeminfo/CMakeLists.txt
--- 2/src/Systeminfo/CMakeLists.txt
+++ b/src/Systeminfo/CMakeLists.txt
@@@ -8,13 -9,10 +8,15 @@@ PKG_CHECK_MODULES(platform_pkgs_systemi
        capi-system-runtime-info
        capi-system-sensor
        sensor
+       tapi
  )
  
 +IF(ENABLE_OPTIONAL_SYSINFO_TEL_SIM_MNGT)
 +PKG_CHECK_MODULES(platform_pkgs_systeminfo_tel_sim REQUIRED
 +      capi-telephony-sim
 +)
 +ENDIF()
+ ADD_DEFINITIONS("-fvisibility=hidden")
  
  INCLUDE_DIRECTORIES(
        ${INCLUDE_COMMON}
@@@ -35,10 -32,13 +37,11 @@@ SET(SRCS_IMP
        Systeminfo.cpp
        JSDisplayInfo.cpp
        JSStorageInfo.cpp
+       JSStorageUnitInfo.cpp
        JSCpuInfo.cpp
        JSWifiNetworkInfo.cpp
 -      JSCellularNetworkInfo.cpp
        JSBatteryInfo.cpp
        JSNetworkInfo.cpp
 -      JSSIMInfo.cpp
        JSDeviceOrientationInfo.cpp
        JSBuildInfo.cpp
        JSLocaleInfo.cpp

diff --cc src/Systeminfo/EventWatchSysteminfo.cpp
Simple merge

diff --cc src/Systeminfo/Systeminfo.cpp
index ec821c9,3a557e3..f94944c
--- 1/src/Systeminfo/Systeminfo.cpp
--- 2/src/Systeminfo/Systeminfo.cpp
+++ b/src/Systeminfo/Systeminfo.cpp
@@@ -1364,9 -1522,10 +1561,10 @@@ PROPERTY_GET_SYSTEMINFO_DEFINITION(Cell
  PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
      Converter converter(context);
      SIMPropertiesPtr SIM(new SIMProperties());
+ 
      return JSSIMInfo::createJSObject(context, SIM);
  }
 -
 +#endif
  PROPERTY_GET_SYSTEMINFO_DEFINITION(DeviceOrientation) {
      LoggerD("enter");
      Converter converter(context);

diff --cc src/Systeminfo/Systeminfo.h
Simple merge