From: Jongmin Lee <jm105.lee@samsung.com>
Date: Thu, 22 Aug 2019 21:27:46 +0000 (+0000)
Subject: Merge "Revert "tizen: Add additional unit for "unified" user session"" into tizen
X-Git-Tag: accepted/tizen/unified/20190905.232214^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b23116a5534314600dfe2735aec28ce9b632feb4;hp=-c;p=platform%2Fupstream%2Fat-spi2-core.git

Merge "Revert "tizen: Add additional unit for "unified" user session"" into tizen
---

b23116a5534314600dfe2735aec28ce9b632feb4
diff --combined meson.build
index e86454d,ab48912..777f821
--- a/meson.build
+++ b/meson.build
@@@ -28,7 -28,6 +28,7 @@@ atspi_datadir = join_paths(atspi_prefix
  atspi_libexecdir = join_paths(atspi_prefix, get_option('libexecdir'))
  atspi_sysconfdir = join_paths(atspi_prefix, get_option('sysconfdir'))
  atspi_libdir = join_paths(atspi_prefix, get_option('libdir'))
 +atspi_bindir = join_paths(atspi_prefix, get_option('bindir'))
  atspi_includedir = join_paths(atspi_prefix, get_option('includedir'))
  
  if get_option('dbus_services_dir') != 'default'
@@@ -43,12 -42,6 +43,6 @@@ els
    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 --combined packaging/at-spi2-core.spec
index fc2c7bc,7981bc8..c2db81e
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@@ -73,7 -73,7 +73,7 @@@ to develop applications that require th
  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
@@@ -101,7 -101,7 +101,7 @@@ rm -fr %{buildroot
  %files -f %{name}.lang
  %manifest %{name}.manifest
  %defattr(-,root,root)
 -%{_libexecdir}/at_spi2_tool
 +%{_bindir}/at_spi2_tool
  
  %doc AUTHORS README
  %license COPYING
@@@ -112,7 -112,6 +112,6 @@@
  %{_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)