Sync with tizen_2.2

Conflicts:
	osp-appfw.manifest
	packaging/osp-appfw.spec
	src/CMakeLists.txt

diff --cc packaging/osp-appfw.spec
index 21fa730,ddb8d4c..b604a2e
mode 100755,100644..100644
--- 1/packaging/osp-appfw.spec
--- 2/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@@ -1,115 -1,120 +1,127 @@@
--Name:       osp-appfw
- Summary:    The App Framework library of OSP 
- Version:    1.2.1.0
 -Summary:    The App Framework library of OSP
 -Version:    1.2.2.1
--Release:    1
- Group:      Application Framework/Libraries
- License:    Apache-2.0
 -Group:      TO_BE/FILLED_IN
 -License:    Apache-2.0 or Flora
--Source0:    %{name}-%{version}.tar.gz
- Source1001:   osp-appfw.manifest
- URL:        https://review.tizen.org/git/?p=platform/framework/native/appfw.git;a=summary
--BuildRequires:  cmake
--BuildRequires:  pkgconfig(capi-appfw-application)
- BuildRequires:  pkgconfig(capi-appfw-app-manager)
- BuildRequires:  pkgconfig(capi-appfw-package-manager)
--BuildRequires:  pkgconfig(capi-content-mime-type)
--BuildRequires:  pkgconfig(capi-network-serial)
--BuildRequires:  pkgconfig(capi-system-device)
--BuildRequires:  pkgconfig(capi-system-info)
--BuildRequires:  pkgconfig(capi-system-power)
--BuildRequires:  pkgconfig(capi-system-runtime-info)
--BuildRequires:  pkgconfig(capi-system-system-settings)
- BuildRequires:  pkgconfig(tapi)
- BuildRequires:  pkgconfig(alarm-service)
- BuildRequires:  pkgconfig(appsvc)
- BuildRequires:  pkgconfig(aul)
- BuildRequires:  pkgconfig(bundle)
- BuildRequires:  pkgconfig(chromium)
- BuildRequires:  pkgconfig(dbus-1)
- BuildRequires:  pkgconfig(dbus-glib-1)
- BuildRequires:  pkgconfig(devman)
- BuildRequires:  pkgconfig(dlog)
- BuildRequires:  pkgconfig(dukgenerator)
- BuildRequires:  pkgconfig(ecore)
- BuildRequires:  pkgconfig(glib-2.0)
- BuildRequires:  pkgconfig(heynoti)
- BuildRequires:  pkgconfig(icu-i18n)
- BuildRequires:  pkgconfig(libcurl)
- BuildRequires:  pkgconfig(libpcre)
- BuildRequires:  pkgconfig(libssl)
- BuildRequires:  pkgconfig(libsoup-2.4)
- BuildRequires:  pkgconfig(libwbxml2)
- BuildRequires:  pkgconfig(libxml-2.0)
- BuildRequires:  pkgconfig(message-port)
- BuildRequires:  pkgconfig(minizip)
- BuildRequires:  pkgconfig(notification)
- BuildRequires:  pkgconfig(openssl)
- BuildRequires:  pkgconfig(pkgmgr)
- BuildRequires:  pkgconfig(pkgmgr-info)
- BuildRequires:  pkgconfig(pmapi)
- BuildRequires:  pkgconfig(libprivilege-control)
- BuildRequires:  pkgconfig(sqlite3)
- BuildRequires:  pkgconfig(uuid)
- BuildRequires:  pkgconfig(vconf)
- BuildRequires:  pkgconfig(zlib)
- BuildRequires:  pkgconfig(haptic)
- BuildRequires:  pkgconfig(x11)
- BuildRequires:  privacy-manager-client-devel
- BuildRequires:  boost-devel
- BuildRequires:  gettext-tools
- BuildRequires:  pkgconfig(security-server)
 -BuildRequires:  pkgconfig(capi-network-bluetooth)
++Name:                 osp-appfw
++Summary:              The App Framework library of OSP 
++Version:              1.2.2.1
++Release:              1
++Group:                        Application Framework/Libraries
++License:              Apache-2.0 or Flora
++Source0:              %{name}-%{version}.tar.gz
++Source1001:           osp-appfw.manifest
++URL:                  https://review.tizen.org/git/?p=platform/framework/native/appfw.git;a=summary
++BuildRequires:        cmake
++BuildRequires:        pkgconfig(capi-appfw-application)
++BuildRequires:        pkgconfig(capi-appfw-app-manager)
++BuildRequires:        pkgconfig(capi-appfw-package-manager)
++BuildRequires:        pkgconfig(capi-content-mime-type)
++BuildRequires:        pkgconfig(capi-network-serial)
++BuildRequires:        pkgconfig(capi-system-device)
++BuildRequires:        pkgconfig(capi-system-info)
++BuildRequires:        pkgconfig(capi-system-power)
++BuildRequires:        pkgconfig(capi-system-runtime-info)
++BuildRequires:        pkgconfig(capi-system-system-settings)
++BuildRequires:        pkgconfig(capi-network-bluetooth)
+ BuildRequires:        pkgconfig(capi-telephony-sim)
+ BuildRequires:        pkgconfig(capi-network-tethering)
+ BuildRequires:        pkgconfig(capi-network-wifi)
+ BuildRequires:        pkgconfig(capi-network-wifi-direct)
+ BuildRequires:        pkgconfig(wifi-direct)
+ BuildRequires:        pkgconfig(capi-media-sound-manager)
 -BuildRequires:  pkgconfig(capi-system-media-key)
++BuildRequires:        pkgconfig(capi-system-media-key)
+ BuildRequires:        pkgconfig(sysman)
 -BuildRequires:  pkgconfig(tapi)
 -BuildRequires:  pkgconfig(alarm-service)
 -BuildRequires:  pkgconfig(appsvc)
 -BuildRequires:  pkgconfig(aul)
 -BuildRequires:  pkgconfig(bundle)
 -BuildRequires:  pkgconfig(chromium)
 -BuildRequires:  pkgconfig(dbus-1)
 -BuildRequires:  pkgconfig(dbus-glib-1)
 -BuildRequires:  pkgconfig(devman)
 -BuildRequires:  pkgconfig(dlog)
 -BuildRequires:  pkgconfig(dukgenerator)
 -BuildRequires:  pkgconfig(ecore)
 -BuildRequires:  pkgconfig(glib-2.0)
 -BuildRequires:  pkgconfig(heynoti)
++BuildRequires:        pkgconfig(tapi)
++BuildRequires:        pkgconfig(alarm-service)
++BuildRequires:        pkgconfig(appsvc)
++BuildRequires:        pkgconfig(aul)
++BuildRequires:        pkgconfig(bundle)
++BuildRequires:        pkgconfig(chromium)
++BuildRequires:        pkgconfig(dbus-1)
++BuildRequires:        pkgconfig(dbus-glib-1)
++BuildRequires:        pkgconfig(devman)
++BuildRequires:        pkgconfig(dlog)
++BuildRequires:        pkgconfig(dukgenerator)
++BuildRequires:        pkgconfig(ecore)
++BuildRequires:        pkgconfig(glib-2.0)
++BuildRequires:        pkgconfig(heynoti)
+ 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(icu-i18n)
 -BuildRequires:  pkgconfig(iniparser)
 -BuildRequires:  pkgconfig(libpcre)
 -BuildRequires:  pkgconfig(libssl)
 -BuildRequires:  pkgconfig(libsoup-2.4)
 -BuildRequires:  pkgconfig(libxml-2.0)
 -BuildRequires:  pkgconfig(message-port)
 -BuildRequires:  pkgconfig(minizip)
 -BuildRequires:  pkgconfig(notification)
 -BuildRequires:  pkgconfig(openssl)
 -BuildRequires:  pkgconfig(pkgmgr)
 -BuildRequires:  pkgconfig(pkgmgr-info)
 -BuildRequires:  pkgconfig(pmapi)
 -BuildRequires:  pkgconfig(libprivilege-control)
 -BuildRequires:  pkgconfig(sqlite3)
 -BuildRequires:  pkgconfig(uuid)
 -BuildRequires:  pkgconfig(vconf)
 -BuildRequires:  pkgconfig(zlib)
 -BuildRequires:  pkgconfig(haptic)
 -BuildRequires:  pkgconfig(x11)
 -BuildRequires:  privacy-manager-client-devel
 -BuildRequires:  capi-security-privilege-manager-devel
 -BuildRequires:  boost-devel
 -BuildRequires:  gettext-tools
 -BuildRequires:  pkgconfig(security-server)
 -BuildRequires:  pkgconfig(badge)
 -BuildRequires:  pkgconfig(appinfo) >= 0.1.0
++BuildRequires:        pkgconfig(icu-i18n)
++BuildRequires:        pkgconfig(iniparser)
++BuildRequires:        pkgconfig(libpcre)
++BuildRequires:        pkgconfig(libssl)
++BuildRequires:        pkgconfig(libsoup-2.4)
++BuildRequires:        pkgconfig(libxml-2.0)
++BuildRequires:        pkgconfig(message-port)
++BuildRequires:        pkgconfig(minizip)
++BuildRequires:        pkgconfig(notification)
++BuildRequires:        pkgconfig(openssl)
++BuildRequires:        pkgconfig(pkgmgr)
++BuildRequires:        pkgconfig(pkgmgr-info)
++BuildRequires:        pkgconfig(pmapi)
++BuildRequires:        pkgconfig(libprivilege-control)
++BuildRequires:        pkgconfig(sqlite3)
++BuildRequires:        pkgconfig(uuid)
++BuildRequires:        pkgconfig(vconf)
++BuildRequires:        pkgconfig(zlib)
++BuildRequires:        pkgconfig(haptic)
++BuildRequires:        pkgconfig(x11)
++BuildRequires:        privacy-manager-client-devel
++BuildRequires:        capi-security-privilege-manager-devel
++BuildRequires:        boost-devel
++BuildRequires:        gettext-tools
++BuildRequires:        pkgconfig(security-server)
++BuildRequires:        pkgconfig(badge)
++BuildRequires:        pkgconfig(appinfo) >= 0.1.0
  
  # runtime requires
- Requires: capi-appfw-app-manager  
- Requires: capi-appfw-application  
 -Requires: capi-appfw-application
--Requires: capi-appfw-package-manager
--Requires: capi-content-mime-type
--Requires: capi-network-serial
--Requires: capi-system-runtime-info
 -Requires: capi-security-privilege-manager
--Requires: chromium
--Requires: message-port
- Requires: osp-env-config
 -Requires: osp-env-config >= 1.2.2.1
--Requires: sqlite
 -Requires: iniparser
--
- Provides:   libosp-appfw.so.1
 -Provides:   libosp-appfw.so.1, libosp-newlib.so.1
--
- Requires(post): /sbin/ldconfig  
 -Requires(post): /sbin/ldconfig
--Requires(post): coreutils
--Requires(postun): /sbin/ldconfig
++Requires:     capi-appfw-app-manager  
++Requires:     capi-appfw-application  
++Requires:     capi-appfw-package-manager
++Requires:     capi-content-mime-type
++Requires:     capi-network-serial
++Requires:     capi-system-runtime-info
++Requires:     capi-security-privilege-manager
++Requires:     chromium
++Requires:     message-port
++Requires:     osp-env-config >= 1.2.2.1
++Requires:     sqlite
++
++Provides:      libosp-appfw.so.1, libosp-newlib.so.1
++
++Requires(post):               /sbin/ldconfig  
++Requires(post):               coreutils
++Requires(postun):     /sbin/ldconfig
  
  %description
  The App Framework library of OSP
  
  %package devel
--Summary:    The App Framework library of OSP (Development)
- Group:      Development/Libraries
 -Group:      TO_BE/FILLED_IN
--Requires:   %{name} = %{version}-%{release}
--Requires: boost-devel
--Requires: pkgconfig(pkgmgr-info)
- Requires: pkgconfig(capi-appfw-app-manager)
++Summary:      The App Framework library of OSP (Development)
++Group:                Development/Libraries
++Requires:     %{name} = %{version}-%{release}
++Requires:     boost-devel
++Requires:     pkgconfig(pkgmgr-info)
++Requires:     pkgconfig(capi-appfw-app-manager)
  
  %description devel
--The  App Framework library of OSP (DEV)
++The   App Framework library of OSP (DEV)
  
  %package internal-devel
- Summary:    OSP app framework internel (Internal)
- Group:      Development/Libraries
 -Summary:    osp app framework internel (Internal)
 -Group:      TO_BE/FILLED_IN
--Requires:   %{name} = %{version}-%{release}
++Summary:      OSP app framework internel (Internal)
++Group:                Development/Libraries
++Requires:     %{name} = %{version}-%{release}
 +Requires: pkgconfig(capi-appfw-app-manager)
  
  %description internal-devel
  The App Framework library of OSP (Internal-DEV)
  
- %package debug
- Summary:    The App Framework library of OSP (Development)
- Group:      Development/Tools
- Requires:   %{name} = %{version}-%{release}
- 
- %description debug
- The App Framework library of OSP (DEV)
- 
  %prep
  %setup -q
 +cp %{SOURCE1001} .
  
  %build
  MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@@ -120,13 -129,16 +136,16 @@@ CXXFLAGS="-O2 -g -pipe -Wall -fno-excep
  %endif
  
  # Call make instruction with smp support
- make %{?jobs:-j%jobs}
+ #make %{?jobs:-j%jobs}
+ make %{?_smp_mflags}
  
- %install
+ %clean
  rm -rf %{buildroot}
+ 
+ %install
  mkdir -p %{buildroot}/usr/share/license
--cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
--cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
++cp %{_builddir}/%{name}-%{version}/LICENSE.Flora      %{buildroot}/usr/share/license/%{name}
++cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2      %{buildroot}/usr/share/license/%{name}
  
  %make_install
  
@@@ -156,19 -169,18 +175,19 @@@ chmod 444 /opt/usr/etc/clocale.lis
  %postun -p /sbin/ldconfig
  
  %files
 -%manifest osp-appfw.manifest
 +%manifest %{name}.manifest
  /usr/share/license/%{name}
- /etc/*
- /opt/usr/share/.osp-compat/share/*
- /opt/usr/etc/*
- /usr/share/osp/.*
+ %config /etc/*
+ %config /opt/usr/etc/*
  /usr/share/locale/*
- /usr/etc/*
+ %config /usr/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*
  
  %files devel
 +%manifest %{name}.manifest
  %{_includedir}/osp/*.h
  %{_includedir}/osp/*.hpp
  %{_libdir}/pkgconfig/osp-appfw.pc
@@@ -183,10 -194,7 +202,6 @@@
  %{_includedir}/osp/system/*
  %{_includedir}/osp/text/*
  %{_includedir}/osp/server/*
+ %{_includedir}/osp/system-server/*
  %{_libdir}/pkgconfig/osp-appfw-server.pc
- 
- %files debug
- %manifest %{name}.manifest
- %{_libdir}/osp/debug/libosp-appfw.so*
- %{_libdir}/osp-server/debug/libosp-appfw-server.so*
- 
+ %{_libdir}/pkgconfig/osp-system-server.pc
 -

diff --cc src/CMakeLists.txt
index 590b982,e11d4b5..a7f458f
mode 100755,100644..100644
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -45,10 -45,9 +45,9 @@@ pkg_check_modules(pkgs REQUIRE
  )
  
  FOREACH(flag ${pkgs_CFLAGS})
 -      SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -Wno-unused")
 +      SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
  ENDFOREACH(flag)
  
- 
  ## Add SubModules
  ADD_SUBDIRECTORY(newlib-compat)
  ADD_SUBDIRECTORY(app)
@@@ -61,3 -61,5 +61,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)