Merge branch tizen_2.2 into tizen

Change-Id: Ib0fa5bac38d8df293f1d0b9f7519e195171a3c9b

diff --cc packaging/app-core.spec
index 782d1e4,672f16c..666cfb6
--- 1/packaging/app-core.spec
--- 2/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@@ -6,16 -3,9 +6,16 @@@ Summary:    Application basi
  Version:    1.2
  Release:    48
  Group:      Application Framework
- License:    Apache License, Version 2.0
+ License:    Apache-2.0
  Source0:    app-core-%{version}.tar.gz
 -Source101:  packaging/core-efl.target
 +%if %{with wayland} && !%{with x}
 +Source101:  packaging/core-efl-wayland.target
 +%else
 +Source101:  packaging/core-efl-x.target
 +BuildRequires:  pkgconfig(x11)
 +BuildRequires:  pkgconfig(ecore-x)
 +%endif
 +Source1001:   app-core.manifest
  BuildRequires:  pkgconfig(sensor)
  BuildRequires:  pkgconfig(vconf)
  BuildRequires:  pkgconfig(aul)
@@@ -100,12 -84,14 +100,14 @@@ make %{?jobs:-j%jobs
  %install
  rm -rf %{buildroot}
  %make_install
 -install -d %{buildroot}%{_prefix}/lib/systemd/user/core-efl.target.wants
 -install -m0644 %{SOURCE101} %{buildroot}%{_prefix}/lib/systemd/user/
 +install -d %{buildroot}%{_unitdir_user}/core-efl.target.wants
 +install -m0644 %{SOURCE101} %{buildroot}%{_unitdir_user}/core-efl.target
  
  mkdir -p %{buildroot}/usr/share/license
- cp LICENSE %{buildroot}/usr/share/license/%{name}
- 
+ cp LICENSE %{buildroot}/usr/share/license/%{name}-efl
+ cp LICENSE %{buildroot}/usr/share/license/%{name}-efl-devel
+ cp LICENSE %{buildroot}/usr/share/license/%{name}-common
+ cp LICENSE %{buildroot}/usr/share/license/%{name}-common-devel
  
  %post efl -p /sbin/ldconfig
  
@@@ -120,27 -106,27 +122,29 @@@
  
  
  %files efl
 -%manifest app-core.manifest
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-efl.so.*
+ /usr/share/license/%{name}-efl
  
  %files efl-devel
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_includedir}/appcore/appcore-efl.h
  %{_libdir}/libappcore-efl.so
  %{_libdir}/pkgconfig/appcore-efl.pc
+ /usr/share/license/%{name}-efl-devel
  
  %files common
 -%manifest app-core.manifest
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-common.so.*
  %{_prefix}/lib/systemd/user/core-efl.target
  %{_prefix}/lib/systemd/user/core-efl.target.wants/
- /usr/share/license/%{name}
+ /usr/share/license/%{name}-common
  
  %files common-devel
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-common.so
  %{_libdir}/pkgconfig/appcore-common.pc