projects
/
platform
/
upstream
/
at-spi2-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for invalid at-spi configuration
[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
e8808ea
..
7981bc8
100644
(file)
--- a/
packaging/at-spi2-core.spec
+++ b/
packaging/at-spi2-core.spec
@@
-1,14
+1,13
@@
-%define debug_package %{nil}
%bcond_with x
Name: at-spi2-core
%bcond_with x
Name: at-spi2-core
-Version: 2.
16.0
+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/
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.
16
/%{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
Source1001: %{name}.manifest
Requires: dbus
BuildRequires: python-devel
@@
-23,6
+22,13
@@
BuildRequires: libX11-devel
BuildRequires: libXtst-devel
BuildRequires: libXi-devel
%endif
BuildRequires: libXtst-devel
BuildRequires: libXi-devel
%endif
+BuildRequires: pkgconfig(vconf)
+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
%description
AT-SPI is a general interface for applications to make use of the
@@
-67,23
+73,23
@@
to develop applications that require these.
cp %{SOURCE1001} .
%build
cp %{SOURCE1001} .
%build
-%autogen --libexecdir=%{_libexecdir}/at-spi2 \
- --with-dbus-daemondir=%{_bindir} \
+meson --prefix /usr/ build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \
%if !%{with x}
%if !%{with x}
- --disable-x11 \
+ -Denable-x11=no \
+%else
+ -Denable-x11=yes \
%endif
%endif
- --disable-static
-%__make %{?_smp_flags}
+ -Denable-static=no
+
+ninja -C build all
%install
%install
-rm -rf %{buildroot}
find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
-%make_install
-%find_lang %{name}
-%check
-mkdir -p %{buildroot}/usr/share/license
-cp -f COPYING %{buildroot}/usr/share/license/%{name}
+export DESTDIR=%{buildroot}
+ninja -C build install
+
+%find_lang %{name}
%clean
rm -fr %{buildroot}
%clean
rm -fr %{buildroot}
@@
-95,16
+101,17
@@
rm -fr %{buildroot}
%files -f %{name}.lang
%manifest %{name}.manifest
%defattr(-,root,root)
%files -f %{name}.lang
%manifest %{name}.manifest
%defattr(-,root,root)
+%{_libexecdir}/at_spi2_tool
+
%doc AUTHORS README
%license COPYING
%doc AUTHORS README
%license COPYING
-%{_libexecdir}/at-spi
2/at-spi
-bus-launcher
-%{_libexecdir}/at-spi2
/at-spi2
-registryd
-%
config %{_sysconfdir}
/at-spi2/accessibility.conf
+%{_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
%{_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)
%files -n libatspi0
%manifest %{name}.manifest
%defattr(-, root, root)
@@
-120,4
+127,3
@@
rm -fr %{buildroot}
%{_includedir}/at-spi-2.0
%{_libdir}/libatspi.so
%{_libdir}/pkgconfig/atspi-2.pc
%{_includedir}/at-spi-2.0
%{_libdir}/libatspi.so
%{_libdir}/pkgconfig/atspi-2.pc
-