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

diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index fc16a70..81089c4 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,32 +1,32 @@
+#
+# Conditional build:
+%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.6.0
+Version:	2.32.0
 Release:	1
 License:	LGPL v2+
 Group:		Daemons
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.6/%{name}-%{version}.tar.xz
-# Source0-md5:	3a8ffab81adb6af9f7f1220f54fd54a0
-URL:		http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	dbus-devel >= 1.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
-BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libtool >= 2:2.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.32/%{name}-%{version}.tar.xz
+# Source0-md5:	57269004541646c4c5cf0bcb7c99bb5b
+Patch0:		%{name}-meson.patch
+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:	gobject-introspection-devel >= 1.32.0
+BuildRequires:	gtk-doc >= 1.25
+BuildRequires:	meson >= 0.40.1
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXevie-devel
-BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xz
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus >= 1.0
+Requires:	dbus >= 1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,8 +54,8 @@ zamiast wcześniejszego ORBIT/CORBA.
 Summary:	at-spi2 core library
 Summary(pl.UTF-8):	Główna biblioteka at-spi2
 Group:		Libraries
-Requires:	dbus-libs >= 1.0
-Requires:	glib2 >= 1:2.28.0
+Requires:	dbus-libs >= 1.5
+Requires:	glib2 >= 1:2.36.0
 Conflicts:	at-spi2-core < 2.2.1-2
 
 %description libs
@@ -69,8 +69,8 @@ Summary:	Header files for at-spi2 library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki at-spi2
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus-devel >= 1.0
-Requires:	glib2-devel >= 1:2.28.0
+Requires:	dbus-devel >= 1.5
+Requires:	glib2-devel >= 1:2.36.0
 Requires:	xorg-lib-libX11-devel
 
 %description devel
@@ -79,11 +79,26 @@ Header files for at-spi2 library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki at-spi2.
 
+%package static
+Summary:	Static at-spi2 library
+Summary(pl.UTF-8):	Statyczna biblioteka at-spi2
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static at-spi2 library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka at-spi2.
+
 %package apidocs
 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.
@@ -93,27 +108,20 @@ Dokumentacja API biblioteki at-spi2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	%{!?with_static_libs:--default-library='shared'} \
+	-Ddocs=true \
+	-Dx11=yes
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%meson_install -C build
 
 %find_lang %{name}
 
@@ -125,14 +133,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libexecdir}/at-spi-bus-launcher
 %attr(755,root,root) %{_libexecdir}/at-spi2-registryd
-%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service
+%dir %{_datadir}/dbus-1/accessibility-services
+%{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
 %{_datadir}/dbus-1/services/org.a11y.Bus.service
-%dir %{_sysconfdir}/at-spi2
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/at-spi2/accessibility.conf
+%dir %{_datadir}/defaults/at-spi2
+%{_datadir}/defaults/at-spi2/accessibility.conf
 %{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
+%{systemduserunitdir}/at-spi-dbus-bus.service
 
 %files libs
 %defattr(644,root,root,755)
@@ -147,6 +157,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/Atspi-2.0.gir
 %{_pkgconfigdir}/atspi-2.pc
 
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libatspi.so.a
+%endif
+
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libatspi