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

This reverts commit ae8997a797d0091db61e8ece94fb0c308078b801.

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

Change-Id: I63f72a202fa9e893f1105a4b879e407108c8e622

diff --git a/packaging/contacts-service-mobile@.service b/packaging/contacts-service-mobile@.service
deleted file mode 100644 (file)
index e92861a..0000000
--- a/packaging/contacts-service-mobile@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Start the Contacts service helper service
-
-[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
-ExecStart=/usr/bin/contacts-service-ipcd
-Restart=on-failure
-RestartSec=1
-
-[Install]
-WantedBy=user-default@.target
-

diff --git a/packaging/contacts-service.spec b/packaging/contacts-service.spec
index df16725..7ff0528 100644 (file)
--- a/packaging/contacts-service.spec
+++ b/packaging/contacts-service.spec
@@ -8,9 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.service
 Source2:    %{name}.socket
 Source3:    %{name}-mobile.service
-Source5:    %{name}@.service
-Source6:    %{name}@.socket
-Source7:    %{name}-mobile@.service
 Source1001: %{name}.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(db-util)
@@ -97,28 +94,17 @@ install -m 0644 %SOURCE3 %{buildroot}%{_unitdir_user}/contacts-service.service.m
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/contacts-service.service
 ln -s ../contacts-service.service %{buildroot}%{_unitdir_user}/delayed.target.wants/contacts-service.service
 
-mkdir -p %{buildroot}%{_unitdir}/user-default@.target.wants
-install -m 0644 %SOURCE7 %{buildroot}%{_unitdir}/contacts-service@.service.mobile
-install -m 0644 %SOURCE5 %{buildroot}%{_unitdir}/contacts-service@.service
-ln -s ../contacts-service@.service %{buildroot}%{_unitdir}/user-default@.target.wants/contacts-service@.service
-
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
 install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/contacts-service.socket
 ln -s ../contacts-service.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contacts-service.socket
 
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
-install -m 0644 %SOURCE6 %{buildroot}%{_unitdir}/contacts-service@.socket
-ln -s ../contacts-service@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/contacts-service@.socket
-
 %post
 _PROFILE=`grep "TZ_BUILD_PROFILE" "/etc/tizen-build.conf" | awk -F '=' '{print $2}'`
 if [ "$_PROFILE" != "mobile" ]
 then
        rm %{_unitdir_user}/contacts-service.service.mobile
-       rm %{_unitdir}/contacts-service@.service.mobile
 else
-       mv %{_unitdir_user}/contacts-service.service.mobile %{_unitdir}/contacts-service.service
-       mv %{_unitdir}/contacts-service@.service.mobile %{_unitdir}/contacts-service@.service
+       mv %{_unitdir_user}/contacts-service.service.mobile %{_unitdir_user}/contacts-service.service
 fi
 
 %post test
@@ -139,11 +125,6 @@ chsmack -e "User" /usr/bin/contacts-service-test
 %{_unitdir_user}/delayed.target.wants/contacts-service.service
 %{_unitdir_user}/sockets.target.wants/contacts-service.socket
 %{_unitdir_user}/contacts-service.socket
-%{_unitdir}/contacts-service@.service
-%{_unitdir}/contacts-service@.service.mobile
-%{_unitdir}/user-default@.target.wants/contacts-service@.service
-%{_unitdir}/user-sockets@.target.wants/contacts-service@.socket
-%{_unitdir}/contacts-service@.socket
 %license LICENSE.APLv2
 
 %files -n lib%{name}

diff --git a/packaging/contacts-service@.service b/packaging/contacts-service@.service
deleted file mode 100644 (file)
index 302c4c3..0000000
--- a/packaging/contacts-service@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Start the Contacts service helper service
-
-[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
-Environment="CMD=timeout" "TIME=90"
-ExecStart=/usr/bin/contacts-service-ipcd $CMD $TIME
-Restart=on-failure
-RestartSec=1
-
-[Install]
-WantedBy=user-default@.target
-

diff --git a/packaging/contacts-service@.socket b/packaging/contacts-service@.socket
deleted file mode 100644 (file)
index 3af112f..0000000
--- a/packaging/contacts-service@.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=Contacts Service socket
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/user/%i/system_share/.contacts_svc_ipc
-Service=contacts-service@%i.service
-
-[Install]
-WantedBy=user-sockets@.target