Revert "Split CXXFLAGS of the spec file for -D_SECURE_LOG"

This reverts commit 87ff601c43f21d2f82fd2792ffb6cc755bd6b03d.

Change-Id: I6ff0358d7e29e22bace8b27d296ba82386a609e9

diff --git a/packaging/osp-app-controls.spec b/packaging/osp-app-controls.spec
index 72fe0a4..ca2af2f 100755 (executable)
--- a/packaging/osp-app-controls.spec
+++ b/packaging/osp-app-controls.spec
@@ -55,22 +55,16 @@ osp appcontrol library (DEV)
 %prep
 %setup -q
 
-%build
+%build 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-
 %ifarch %{ix86}
-       ARCH=x86
-       CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_"
-       %if 0%{?simulator}
-               CXXFLAGS="$CXXFLAGS -D_OSP_EMUL_"
-       %endif
+%if 0%{?simulator}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
 %else
-       ARCH=arm
-       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_"
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
 %endif
-
-%if 0%{?tizen_build_binary_release_type_eng}
-       CXXFLAGS="$CXXFLAGS -D_SECURE_LOG"
+%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_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
 %endif
 
 # Call make instruction with smp support