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

This reverts commit be366a16c0d5ed2252461286299fc039b2cf9b66.

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

Change-Id: I137fc81c3aa2a1e6d07553ed7e82ddb8766ed48b

diff --git a/packaging/media-server-user@.path b/packaging/media-server-user@.path
deleted file mode 100644 (file)
index f64b5cb..0000000
--- a/packaging/media-server-user@.path
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=media-server-user path activation
-
-[Path]
-PathExists=/run/media-server/media_ipc_dbbatchupdate.socket

diff --git a/packaging/media-server-user@.service b/packaging/media-server-user@.service
deleted file mode 100644 (file)
index d307244..0000000
--- a/packaging/media-server-user@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Media server user
-DefaultDependencies=no
-
-[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=idle
-CPUAccounting=yes
-CPUQuota=10%
-ExecStart=/usr/bin/sh -c "/usr/bin/mediadb-update check_db;/usr/bin/mediadb-update -r `/usr/bin/tzplatform-get TZ_USER_CONTENT | /usr/bin/sed -e 's/^.*=//g'`"
-
-[Install]
-WantedBy=user-default@.target

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 309986e..26471d1 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -8,8 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    media-server.service
 Source2:       media-server-user.service
 Source3:    media-server-user.path
-Source4:       media-server-user@.service
-Source5:    media-server-user@.path
 Source1001:     %{name}.manifest
 Source1002:     libmedia-utils.manifest
 Source1003:     libmedia-utils-devel.manifest
@@ -102,10 +100,6 @@ install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/media-server.service
 mkdir -p %{buildroot}%{_unitdir_user}
 install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/media-server-user.service
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-server-user.path
-
-mkdir -p %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/media-server-user@.service
-install -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/media-server-user@.path
 %endif
 
 ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/media-server.service
@@ -131,9 +125,6 @@ cp -rf %{_builddir}/%{name}-%{version}/data/media.db %{buildroot}/etc/multimedia
 mkdir -p %{_unitdir_user}/basic.target.wants/
 ln -sf ../media-server-user.path  %{_unitdir_user}/basic.target.wants/
 
-mkdir -p %{_unitdir}/user-basic@.target.wants/
-ln -sf ../media-server-user@.path  %{_unitdir}/user-basic@.target.wants/
-
 chmod 755 /etc/gumd/useradd.d/30_media-server-add.post
 
 %post -n libmedia-utils -p /sbin/ldconfig
@@ -155,8 +146,6 @@ chmod 755 /etc/gumd/useradd.d/30_media-server-add.post
 %if !0%{?product_tv}
 %{_unitdir_user}/media-server-user.service
 %{_unitdir_user}/media-server-user.path
-%{_unitdir}/media-server-user@.service
-%{_unitdir}/media-server-user@.path
 %endif
 /etc/multimedia/media_content_config.ini
 /etc/gumd/useradd.d/30_media-server-add.post