Merge branch 'temp' into tizen

Conflicts:
	packaging/app-core.spec

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

diff --cc packaging/app-core.spec
index 5223a83,fde714a..d0f88df
--- 1/packaging/app-core.spec
--- 2/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@@ -86,9 -84,12 +86,12 @@@ 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}
  
+ mkdir -p %{buildroot}/usr/share/license
+ cp LICENSE %{buildroot}/usr/share/license/%{name}
+ 
  
  %post efl -p /sbin/ldconfig
  
@@@ -115,14 -115,14 +118,15 @@@
  %{_libdir}/pkgconfig/appcore-efl.pc
  
  %files common
 -%manifest app-core.manifest
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-common.so.*
- %{_unitdir_user}/core-efl.target
- %{_unitdir_user}/core-efl.target.wants/
+ %{_prefix}/lib/systemd/user/core-efl.target
+ %{_prefix}/lib/systemd/user/core-efl.target.wants/
+ /usr/share/license/%{name}
  
  %files common-devel
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-common.so
  %{_libdir}/pkgconfig/appcore-common.pc