Merge "at_spi2_tool is now in path'ed directory" into tizen

diff --git a/bus/at-spi-dbus-bus@.service.in b/bus/at-spi-dbus-bus@.service.in
new file mode 100644 (file)
index 0000000..f8543d3
--- /dev/null
+++ b/bus/at-spi-dbus-bus@.service.in
@@ -0,0 +1,12 @@
+[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 75c6591..21e453e 100644 (file)
--- a/bus/meson.build
+++ b/bus/meson.build
@@ -31,6 +31,12 @@ 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 777f821..e86454d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -43,6 +43,12 @@ 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 f8ec862..4ff7d5e 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,6 +19,10 @@ 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 f82ad74..fc2c7bc 100644 (file)
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@ -73,7 +73,7 @@ to develop applications that require these.
 cp %{SOURCE1001} .
 
 %build
-meson --prefix /usr/ build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \
+meson --prefix /usr --libdir %{_libdir} build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \
 %if !%{with x}
         -Denable-x11=no \
 %else
@@ -112,6 +112,7 @@ 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)