Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provide...

Sync with the latest tizen 2.2 implementations

Conflicts:
	src/main.c

Change-Id: Icd431d2b9d12006a33e70ee0056542a534d1e5ff

diff --cc CMakeLists.txt
index 7366c7c,850dc5e..6429e1c
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -52,10 -55,10 +55,10 @@@ ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET"
  ADD_DEFINITIONS(${pkg_CFLAGS})
  
  # -fpie
 -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -Werror -g -fno-builtin-malloc")
 +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -g -fno-builtin-malloc")
  #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
  
- ADD_EXECUTABLE(${PROJECT_NAME}
+ ADD_EXECUTABLE("${PROJECT_NAME}.loader"
        src/main.c
        src/so_handler.c
        src/fault.c

diff --cc packaging/org.tizen.data-provider-slave.spec
index 5e05282,a819af9..49fdd13
--- 1/packaging/org.tizen.data-provider-slave.spec
--- 2/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@@ -43,9 -44,15 +44,15 @@@ Supporting the In-house livebox only
  %setup -q
  
  %build
+ %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 . -DCMAKE_INSTALL_PREFIX=%{_prefix}
  #-fpie  LDFLAGS="${LDFLAGS} -pie -O3"
 -CFLAGS="${CFLAGS} -Wall -Winline -Werror -fno-builtin-malloc" make %{?jobs:-j%jobs}
 +CFLAGS="${CFLAGS} -Wall -Winline -fno-builtin-malloc" make %{?jobs:-j%jobs}
  
  %install
  rm -rf %{buildroot}