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

This reverts commit 4f1f1b72f4937f91fde89663745ca15c4fb8420f.

We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.

Change-Id: Ibe599b86437d18d11a395f1e3cedaf6b2d958242

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index 51104ac7215f7602aff615dff226697918ab8d81..1cea70433f04cd821d2e72d394aceccb5ae82984 100644 (file)
--- a/packaging/sync-manager.spec
+++ b/packaging/sync-manager.spec
@@ -11,7 +11,6 @@ Source0:   %{name}-%{version}.tar.gz
 Source1:   sync-manager.service
 Source2:   org.tizen.sync.service
 Source3:   org.tizen.sync.conf
-Source4:   sync-manager@.service
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(capi-appfw-app-manager)
@@ -84,10 +83,6 @@ mkdir -p %{buildroot}%{_unitdir_user}/delayed.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/sync-manager.service
 ln -s ../sync-manager.service %{buildroot}%{_unitdir_user}/delayed.target.wants/sync-manager.service
 
-mkdir -p %{buildroot}%{_unitdir}/user-default@.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/sync-manager@.service
-ln -s ../sync-manager@.service %{buildroot}%{_unitdir}/user-default@.target.wants/sync-manager@.service
-
 mkdir -p %{buildroot}/usr/share/dbus-1/services
 install -m 0644 %SOURCE2 %{buildroot}/usr/share/dbus-1/services/org.tizen.sync.service
 
@@ -111,8 +106,6 @@ install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/dbus-1/session.d/org.tizen.s
 %{_bindir}/*
 %{_unitdir_user}/sync-manager.service
 %{_unitdir_user}/delayed.target.wants/sync-manager.service
-%{_unitdir}/sync-manager@.service
-%{_unitdir}/user-default@.target.wants/sync-manager@.service
 %attr(0644,root,root) /usr/share/dbus-1/services/org.tizen.sync.service
 
 %files -n libcore-sync-client

diff --git a/packaging/sync-manager@.service b/packaging/sync-manager@.service
deleted file mode 100644 (file)
index da25dee..0000000
--- a/packaging/sync-manager@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=sync manager service startup script
-
-[Service]
-User=%i
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus
-Environment=XDG_RUNTIME_DIR=/run/user/%i
-SmackProcessLabel=User
-Type=dbus
-BusName=org.tizen.sync
-ExecStart=/usr/bin/sync-service
-
-[Install]
-WantedBy=user-default@.target