Merge branch 'temp' into nkw

Conflicts:
	packaging/osp-appfw.spec

Change-Id: Ie8d2fa49d74696d1f7b533b523fd3387a0237b65
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>

diff --cc packaging/osp-appfw.spec
index 8c3c9a5,3501534..67a4909
mode 100644,100644..100755
--- 1/packaging/osp-appfw.spec
--- 2/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@@ -42,17 -35,15 +42,16 @@@ BuildRequires:  pkgconfig(devman
  BuildRequires:  pkgconfig(dlog)
  BuildRequires:  pkgconfig(dukgenerator)
  BuildRequires:  pkgconfig(ecore)
 +BuildRequires:  pkgconfig(edbus)
 +BuildRequires:  pkgconfig(edje)
 +BuildRequires:  pkgconfig(eet)
 +BuildRequires:  pkgconfig(efreet)
 +BuildRequires:  pkgconfig(eina)
 +BuildRequires:  pkgconfig(elementary)
 +BuildRequires:  pkgconfig(ethumb)
 +BuildRequires:  pkgconfig(evas)
  BuildRequires:  pkgconfig(glib-2.0)
 -BuildRequires:        pkgconfig(elementary)
 -BuildRequires:        pkgconfig(eina)
 -BuildRequires:        pkgconfig(evas)
 -BuildRequires:        pkgconfig(edje)
 -BuildRequires:        pkgconfig(eet)
 -BuildRequires:        pkgconfig(edbus)
 -BuildRequires:        pkgconfig(efreet)
 -BuildRequires:        pkgconfig(ethumb)
 +BuildRequires:  pkgconfig(haptic)
- BuildRequires:  pkgconfig(heynoti)
  BuildRequires:  pkgconfig(icu-i18n)
  BuildRequires:  pkgconfig(iniparser)
  BuildRequires:  pkgconfig(libpcre)
@@@ -121,23 -117,40 +120,31 @@@ cp %{SOURCE1001} 
  
  %build
  MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+ 
  %ifarch %{ix86}
- %if 0%{?simulator}
- CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+       ARCH=x86
+       CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_"
+       %if 0%{?simulator}
+               CXXFLAGS="$CXXFLAGS -D_OSP_EMUL_"
+       %endif
  %else
- CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+       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_"
  %endif
- %else
- CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
+ 
+ %if 0%{?tizen_build_binary_release_type_eng}
+       CXXFLAGS="$CXXFLAGS -D_SECURE_LOG"
  %endif
  
 -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=${ARCH}
++%cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=${ARCH}
+ 
 -# Call make instruction with smp support
 -#make %{?jobs:-j%jobs}
  make %{?_smp_mflags}
  
 -%clean
 -rm -rf %{buildroot}
 -
  %install
 -mkdir -p %{buildroot}/usr/share/license
 -cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
 -cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/license/%{name}
 -
  %make_install
  
 +%find_lang osp
  %post
 -/bin/rm -f /etc/ld.so.cache
  /sbin/ldconfig
  
  mkdir -p /opt/usr/share/.osp-compat/share/AppControl
@@@ -160,18 -173,16 +167,18 @@@ chown -R 5000:5000 /opt/usr/medi
  locale -a > /opt/usr/etc/clocale.list
  chmod 444 /opt/usr/etc/clocale.list
  
 +
  %postun -p /sbin/ldconfig
  
 -%files
 -%manifest osp-appfw.manifest
 -/usr/share/license/%{name}
 -%config /etc/*
 +%files -f osp.lang
 +
 +%manifest %{name}.manifest
 +%license LICENSE.APLv2 LICENSE.Flora
 +%config %{_sysconfdir}/*
  %config /opt/usr/etc/*
 -%config /usr/etc/*
+ /usr/share/locale/*
 +%config %{_prefix}/etc/*
  %{_libdir}/osp/libosp-appfw.so*
- %{_libdir}/osp/libosp-newlib.so*
  %{_libdir}/osp-server/libosp-appfw-server.so*
  %{_libdir}/osp-server/libosp-system-server.so*
  

diff --cc src/CMakeLists.txt
index a7f458f,0efa270..932efac
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -61,4 -60,5 +60,4 @@@ ADD_SUBDIRECTORY(text
  ADD_SUBDIRECTORY(appfw)
  ADD_SUBDIRECTORY(osp-string)
  ADD_SUBDIRECTORY(server osp-appfw-server)
- ADD_SUBDIRECTORY(system-server osp-system-server)
+ ADD_SUBDIRECTORY(system-server osp-system-server)
 -