X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=at-spi2-core.spec;h=ee7164b7c1afad865adfa0ae7479dc1c4c2ad1fb;hb=a18fbbb;hp=81089c47351a2980ce1cbfbfc95284fd4aa373ef;hpb=fad88c4c42c8faa1022297365d3ab2b23d2f5327;p=packages%2Fat-spi2-core.git

diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 81089c4..ee7164b 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,25 +1,28 @@
 #
 # Conditional build:
+%bcond_without	apidocs		# API documentation
 %bcond_with	static_libs	# static library
 
 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.32.0
+Version:	2.42.0
 Release:	1
-License:	LGPL v2+
+License:	LGPL v2.1+
 Group:		Daemons
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.32/%{name}-%{version}.tar.xz
-# Source0-md5:	57269004541646c4c5cf0bcb7c99bb5b
-Patch0:		%{name}-meson.patch
+Source0:	https://download.gnome.org/sources/at-spi2-core/2.42/%{name}-%{version}.tar.xz
+# Source0-md5:	ce5e462a76e7480bd27e55828696eea4
 URL:		https://wiki.linuxfoundation.org/accessibility/d-bus
 BuildRequires:	dbus-devel >= 1.5
 BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.36.0
+BuildRequires:	glib2-devel >= 1:2.62.0
 BuildRequires:	gobject-introspection-devel >= 1.32.0
-BuildRequires:	gtk-doc >= 1.25
-BuildRequires:	meson >= 0.40.1
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.25}
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXi-devel
@@ -55,7 +58,7 @@ Summary:	at-spi2 core library
 Summary(pl.UTF-8):	Główna biblioteka at-spi2
 Group:		Libraries
 Requires:	dbus-libs >= 1.5
-Requires:	glib2 >= 1:2.36.0
+Requires:	glib2 >= 1:2.62.0
 Conflicts:	at-spi2-core < 2.2.1-2
 
 %description libs
@@ -70,7 +73,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki at-spi2
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-devel >= 1.5
-Requires:	glib2-devel >= 1:2.36.0
+Requires:	glib2-devel >= 1:2.62.0
 Requires:	xorg-lib-libX11-devel
 
 %description devel
@@ -96,9 +99,7 @@ Summary:	at-spi2 library API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki at-spi2
 Group:		Documentation
 Requires:	gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 at-spi2 library API documentation.
@@ -108,20 +109,19 @@ Dokumentacja API biblioteki at-spi2.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %meson build \
 	%{!?with_static_libs:--default-library='shared'} \
-	-Ddocs=true \
+	%{?with_apidocs:-Ddocs=true} \
 	-Dx11=yes
 
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -141,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.a11y.Bus.service
 %dir %{_datadir}/defaults/at-spi2
 %{_datadir}/defaults/at-spi2/accessibility.conf
+%{_sysconfdir}/xdg/Xwayland-session.d/00-at-spi
 %{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
 %{systemduserunitdir}/at-spi-dbus-bus.service
 
@@ -160,9 +161,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libatspi.so.a
+%{_libdir}/libatspi.a
 %endif
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libatspi
+%endif