- allow building on systems without systemd

[packages/at-spi2-core.git] / at-spi2-core.spec

diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index e7b93fabbc4b28617c9a5ca990713e4c6fda0d98..9fc664c1f0ca97ec89594674e59437d9d8cb31f4 100644 (file)
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -2,16 +2,17 @@
 # Conditional build:
 %bcond_without apidocs         # API documentation
 %bcond_without static_libs     # static library
+%bcond_without systemd         # systemd
 
 Summary:       Protocol definitions and daemon for D-Bus at-spi
 Summary(pl-UTF-8):     Definicje protokołu oraz demon at-spi dla usługi D-Bus
 Name:          at-spi2-core
-Version:       2.48.3
+Version:       2.52.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Daemons
-Source0:       https://download.gnome.org/sources/at-spi2-core/2.48/%{name}-%{version}.tar.xz
-# Source0-md5: 4ef1875d9e7035f672d494b997c892af
+Source0:       https://download.gnome.org/sources/at-spi2-core/2.52/%{name}-%{version}.tar.xz
+# Source0-md5: e6591545b2bf204fe9a58f777bd0b78a
 URL:           https://wiki.linuxfoundation.org/accessibility/d-bus
 BuildRequires: dbus-devel >= 1.5
 BuildRequires: gettext-tools >= 0.19.8
@@ -23,7 +24,7 @@ BuildRequires:        meson >= 0.63.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
-BuildRequires: rpmbuild(macros) >= 2.011
+BuildRequires: rpmbuild(macros) >= 2.029
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXi-devel
@@ -101,7 +102,6 @@ Statyczna biblioteka at-spi2.
 Summary:       at-spi2 library API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki at-spi2
 Group:         Documentation
-Requires:      gtk-doc-common
 BuildArch:     noarch
 
 %description apidocs
@@ -242,7 +242,6 @@ Summary:    ATK API documentation
 Summary(pl.UTF-8):     Dokumentacja API ATK
 Epoch:         1
 Group:         Documentation
-Requires:      gtk-doc-common
 BuildArch:     noarch
 
 %description -n atk-apidocs
@@ -257,6 +256,14 @@ Dokumentacja API ATK.
 %build
 %meson build \
        %{!?with_static_libs:--default-library='shared'} \
+       -Ddbus_daemon=/usr/bin/dbus-daemon \
+%if %{with systemd}
+       -Ddbus_broker=/usr/bin/dbus-broker-launch \
+       -Ddefault_bus=dbus-broker \
+%else
+       -Ddefault_bus=dbus-daemon \
+       -Duse_systemd=false \
+%endif
        %{?with_apidocs:-Ddocs=true} \
        -Dx11=enabled
 
@@ -268,9 +275,8 @@ rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 
 %if %{with apidocs}
-# FIXME: where to package gi-docgen generated docs?
-install -d $RPM_BUILD_ROOT%{_gtkdocdir}
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/{atk,libatspi} $RPM_BUILD_ROOT%{_gtkdocdir}
+install -d $RPM_BUILD_ROOT%{_gidocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/{atk,libatspi} $RPM_BUILD_ROOT%{_gidocdir}
 %endif
 
 %find_lang %{name}
@@ -329,7 +335,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libatspi
+%{_gidocdir}/libatspi
 %endif
 
 %files -n at-spi2-atk
@@ -375,5 +381,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files -n atk-apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/atk
+%{_gidocdir}/atk
 %endif