From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 07:19:22 +0000 (+0000)
Subject: Revert "tizen: Add additional unit for "unified" user session"
X-Git-Tag: accepted/tizen/unified/20190905.232214^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fat-spi2-core.git;a=commitdiff_plain;h=1ac0a39bb204a1543dc7a3d52dc0a85ae6d53922

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

This reverts commit c64ea0f61a0842c7b71c3ccb9018fd9dce088164.

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

Change-Id: I4790604bf3b41c484aef3ffd029719f04a92fbce
---

diff --git a/bus/at-spi-dbus-bus@.service.in b/bus/at-spi-dbus-bus@.service.in
deleted file mode 100644
index f8543d3..0000000
--- a/bus/at-spi-dbus-bus@.service.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Accessibility services bus
-
-[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.a11y.Bus
-ExecStart=@libexecdir@/at-spi-bus-launcher
diff --git a/bus/meson.build b/bus/meson.build
index 21e453e..75c6591 100644
--- a/bus/meson.build
+++ b/bus/meson.build
@@ -31,12 +31,6 @@ configure_file(input: 'at-spi-dbus-bus.service.in',
                install: true,
                install_dir: systemd_user_dir)
 
-configure_file(input: 'at-spi-dbus-bus@.service.in',
-               output: 'at-spi-dbus-bus@.service',
-               configuration: libexec_conf,
-               install: true,
-               install_dir: systemd_system_dir)
-
 launcher_args = [
              '-DSYSCONFDIR="@0@"'.format(atspi_sysconfdir),
              '-DDATADIR="@0@"'.format(atspi_datadir),
diff --git a/meson.build b/meson.build
index 7eaa416..ab48912 100644
--- a/meson.build
+++ b/meson.build
@@ -42,12 +42,6 @@ else
   systemd_user_dir = join_paths(get_option('prefix'), 'lib/systemd/user')
 endif
 
-if get_option('systemd_system_dir') != 'default'
-  systemd_system_dir = get_option('systemd_system_dir')
-else
-  systemd_system_dir = join_paths(get_option('prefix'), 'lib/systemd/system')
-endif
-
 # Dependencies
 libdbus_req_version = '>= 1.5'
 glib_req_version = '>= 2.32.0'
diff --git a/meson_options.txt b/meson_options.txt
index 4ff7d5e..f8ec862 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,10 +19,6 @@ option('systemd_user_dir',
        description: 'Location of the systemd user services',
        type: 'string',
        value: 'default')
-option('systemd_system_dir',
-       description: 'Location of the systemd system services',
-       type: 'string',
-       value: 'default')
 option('enable_docs',
        description: 'Generate API reference for atspi (requires GTK-Doc)',
        type: 'boolean',
diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec
index f9af8d2..7981bc8 100644
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@ -112,7 +112,6 @@ rm -fr %{buildroot}
 %{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
 %{_datadir}/dbus-1/services/org.a11y.Bus.service
 %{_prefix}/lib/systemd/user/at-spi-dbus-bus.service
-%{_prefix}/lib/systemd/system/at-spi-dbus-bus@.service
 %files -n libatspi0
 %manifest %{name}.manifest
 %defattr(-, root, root)