Merge "Nabi issue N_SE-49172, N_SE-49295, N_SE-49175, N_SE-49183, N_SE-48987 resoluti...

diff --git a/packaging/apps.Settings.spec b/packaging/apps.Settings.spec
index 4e5c28c..54f8836 100644 (file)
--- a/packaging/apps.Settings.spec
+++ b/packaging/apps.Settings.spec
@@ -30,8 +30,12 @@ Verification application: Settings
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
+%if 0%{?simulator}
 CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %else
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%endif
+%else
 CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %endif