Merge upstream branch 2.31.1 into branch origin/tizen

[platform/upstream/at-spi2-core.git] / packaging / at-spi2-core.spec

diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec
index a053eb1..74cb63b 100644 (file)
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@ -1,13 +1,13 @@
 %bcond_with x
 
 Name: at-spi2-core
-Version: 2.26.1
+Version: 2.31.1
 Release: 0
 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation
 License: LGPL-2.0+
 Group: System/Libraries
 Url: http://www.gnome.org/
-Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.26/%{name}-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.31/%{name}-%{version}.tar.xz
 Source1001:    %{name}.manifest
 Requires:      dbus
 BuildRequires: python-devel
@@ -27,6 +27,8 @@ BuildRequires: pkgconfig(appsvc)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(aul)
 BuildRequires: gobject-introspection
+BuildRequires: meson
+BuildRequires: app-svc-devel
 
 %description
 AT-SPI is a general interface for applications to make use of the
@@ -71,19 +73,20 @@ to develop applications that require these.
 cp %{SOURCE1001} .
 
 %build
-%autogen --libexecdir=%{_libexecdir}/at-spi2 \
-        --with-dbus-daemondir=%{_bindir} \
+meson build -Dwith-dbus-daemondir=%{_bindir} \
 %if !%{with x}
-        --disable-x11 \
+        -Denable-x11=no \
+%else
+        -Denable-x11=yes \
 %endif
-        --disable-static
-%__make %{?_smp_flags}
+        -Denable-static=no
+
+(cd build && ninja)
 
 %install
-rm -rf %{buildroot}
 find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
 
-%make_install
+(cd build && DESTDIR=%{buildroot} ninja install)
 %find_lang %{name}
 
 %clean
@@ -96,21 +99,21 @@ rm -fr %{buildroot}
 %files -f %{name}.lang
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_bindir}/at_spi2_tool
+/usr/local/libexec/at_spi2_tool
 
 %doc AUTHORS README
 %license COPYING
-%{_libexecdir}/at-spi2/at-spi-bus-launcher
-%{_libexecdir}/at-spi2/at-spi2-registryd
-%{_datadir}/defaults/at-spi2/accessibility.conf
-%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
-%{_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
+/usr/local/libexec/at-spi-bus-launcher
+/usr/local/libexec/at-spi2-registryd
+/usr/local/share/defaults/at-spi2/accessibility.conf
+/usr/local/etc/xdg/autostart/at-spi-dbus-bus.desktop
+/usr/local/share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
+/usr/local/share/dbus-1/services/org.a11y.Bus.service
+/usr/local/lib/systemd/user/at-spi-dbus-bus.service
 %files -n libatspi0
 %manifest %{name}.manifest
 %defattr(-, root, root)
-%{_libdir}/libatspi.so.0*
+/usr/local/lib/libatspi.so.0*
 
 %files -n typelib-1_0-Atspi-2_0
 %manifest %{name}.manifest
@@ -119,6 +122,6 @@ rm -fr %{buildroot}
 %files devel
 %manifest %{name}.manifest
 %defattr(-, root, root)
-%{_includedir}/at-spi-2.0
-%{_libdir}/libatspi.so
-%{_libdir}/pkgconfig/atspi-2.pc
+/usr/local/include/at-spi-2.0
+/usr/local/lib/libatspi.so
+/usr/local/lib/pkgconfig/atspi-2.pc