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
+++ /dev/null
-[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
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),
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'
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',
%{_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)