Merge "Revert "tizen: Add additional unit for "unified" user session"" into tizen

diff --cc packaging/email-service.spec
index 74c21ee,1e2039b..3f93a85
--- 1/packaging/email-service.spec
--- 2/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@@ -106,12 -104,8 +104,7 @@@ find -name '*.pc' -exec sed -i -e 's/\$
  mkdir -p %{buildroot}%{_unitdir_user}
  mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
  install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir_user}/email-service.service
 -ln -s ../email-service.service %{buildroot}%{_unitdir_user}/default.target.wants/email-service.service
  
- mkdir -p %{buildroot}%{_unitdir}
- mkdir -p %{buildroot}%{_unitdir}/user-default@.target.wants
- install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/email-service@.service
- ln -s ../email-service@.service %{buildroot}%{_unitdir}/user-default@.target.wants/email-service@.service
- 
  mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
  install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/email-service.socket
  ln -s ../email-service.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/email-service.socket
@@@ -153,12 -143,9 +142,8 @@@ systemctl daemon-reloa
  %{_bindir}/email-service
  %{_libdir}/lib*.so.*
  %{_unitdir_user}/email-service.service
 -%{_unitdir_user}/default.target.wants/email-service.service
  %{_unitdir_user}/email-service.socket
  %{_unitdir_user}/sockets.target.wants/email-service.socket
- %{_unitdir}/email-service@.service
- %{_unitdir}/user-default@.target.wants/email-service@.service
- %{_unitdir}/email-service@.socket
- %{_unitdir}/user-sockets@.target.wants/email-service@.socket
  %{_datarootdir}/dbus-1/services/email-service.service
  %license LICENSE
  %license LICENSE.BSD