From: Patrick McCarty <patrick.mccarty@linux.intel.com>
Date: Tue, 13 Nov 2012 22:09:37 +0000 (-0800)
Subject: Merge branch 'master' into systemd
X-Git-Tag: 2.1b_release~2^2~9^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a8136717ede8e4d63d598142861825b9d77108b;p=framework%2Fappfw%2Fapp-core.git

Merge branch 'master' into systemd
---

1a8136717ede8e4d63d598142861825b9d77108b
diff --cc packaging/app-core.spec
index f3637d5,c4ec025..93a8eb9
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@@ -114,10 -112,9 +115,11 @@@ install -m0644 %{SOURCE101} %{buildroot
  %{_libdir}/pkgconfig/appcore-efl.pc
  
  %files common
+ %manifest app-core.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libappcore-common.so.*
 +%{_libdir}/systemd/user/core-efl.target
 +%{_libdir}/systemd/user/core-efl.target.wants/
  
  %files common-devel
  %defattr(-,root,root,-)