Sync with tizen_2.2

Change-Id: I231927e53e41d950a784743e818aea5df9af61a2

diff --cc packaging/osp-env-config.spec
index 007b62d,d3ca86b..27f130d
--- 1/packaging/osp-env-config.spec
--- 2/packaging/osp-env-config.spec
+++ b/packaging/osp-env-config.spec
@@@ -26,18 -25,25 +26,26 @@@ osp application environment cofiguratio
  
  %prep
  %setup -q
 +cp %{SOURCE1001} .
  
  %build
+ %if 0%{?tizen_build_binary_release_type_eng}
+ CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
+ %endif
  MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+ 
  %ifarch %{ix86} x86_64
  %if 0%{?simulator}
- CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_ -D_SECURE_LOG" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+ CFLAGS="$CFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
  %else
- CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_  -D_SECURE_LOG" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+ CFLAGS="$CFLAGS -D_OSP_DEBUG_ -D_OSP_X86_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
  %endif
  %else
- CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_ -D_SECURE_LOG" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+ %if 0%{?tizen_build_binary_release_type_eng}
+ CFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_ -DTIZEN_ENGINEER_MODE" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+ %else
+ CFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+ %endif
  %endif
  
  # Call make instruction with smp support