From f5f115439475eb34445b7ab3a952758a34e72d28 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Thu, 14 Feb 2019 08:42:07 +0900 Subject: [PATCH] resolve build error in aarch64 and x86_64 Change-Id: I7cb193c626a19a818ed0c232d3cc788866679c82 --- packaging/at-spi2-core.spec | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index 74cb63b..b4ac7f0 100644 --- 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 build -Dwith-dbus-daemondir=%{_bindir} \ +meson --prefix /usr/ build -Dwith-dbus-daemondir=%{_bindir} \ %if !%{with x} -Denable-x11=no \ %else @@ -81,12 +81,14 @@ meson build -Dwith-dbus-daemondir=%{_bindir} \ %endif -Denable-static=no -(cd build && ninja) +ninja -C build all %install find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f -(cd build && DESTDIR=%{buildroot} ninja install) +export DESTDIR=%{buildroot} +ninja -C build install + %find_lang %{name} %clean @@ -99,21 +101,21 @@ rm -fr %{buildroot} %files -f %{name}.lang %manifest %{name}.manifest %defattr(-,root,root) -/usr/local/libexec/at_spi2_tool +%{_libexecdir}/at_spi2_tool %doc AUTHORS README %license COPYING -/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 +%{_libexecdir}/at-spi-bus-launcher +%{_libexecdir}/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 %files -n libatspi0 %manifest %{name}.manifest %defattr(-, root, root) -/usr/local/lib/libatspi.so.0* +%{_libdir}/libatspi.so.0* %files -n typelib-1_0-Atspi-2_0 %manifest %{name}.manifest @@ -122,6 +124,6 @@ rm -fr %{buildroot} %files devel %manifest %{name}.manifest %defattr(-, root, root) -/usr/local/include/at-spi-2.0 -/usr/local/lib/libatspi.so -/usr/local/lib/pkgconfig/atspi-2.pc +%{_includedir}/at-spi-2.0 +%{_libdir}/libatspi.so +%{_libdir}/pkgconfig/atspi-2.pc -- 2.7.4