[packages/at-spi] - adjusted to allow build in current environment

[qboosh]

commit c5cdccd381d6c04d2745beb1799e223f9e025689
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 30 14:43:29 2023 +0100

    - adjusted to allow build in current environment

 at-spi-ac.patch     | 11 +++++++++++
 at-spi-gtkdoc.patch | 10 ++++++++++
 at-spi.spec         | 27 ++++++++++++++++-----------
 3 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/at-spi.spec b/at-spi.spec
index 7df9f55..8874649 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
+%bcond_without	static_libs	# static library
 
 Summary:	Assistive Technology Service Provider Interface
 Summary(pl.UTF-8):	Interfejs pozwalający na korzystanie z urządzeń wspomagających
@@ -12,6 +12,8 @@ Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	bc62c41f18529d56271fa1ae6cad8629
 Patch0:		%{name}-format.patch
+Patch1:		%{name}-gtkdoc.patch
+Patch2:		%{name}-ac.patch
 URL:		http://developer.gnome.org/projects/gap/
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	ORBit2-devel >= 2.14.10
@@ -31,10 +33,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	python >= 1:2.4
 BuildRequires:	python-modules >= 1:2.4
-BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sed >= 4.0
+BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
@@ -42,8 +45,6 @@ BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXtst-devel
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
-# sr at Latn vs. sr at latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -131,18 +132,22 @@ Wiązania AT-SPI dla Pythona.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
-%{__automake}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	%{__enable_disable static_libs static} \
-	--enable-relocate \
+	--enable-compile-warnings=minimum \
 	--enable-gtk-doc \
+	--enable-relocate \
+	%{__enable_disable static_libs static} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -155,12 +160,12 @@ rm -rf $RPM_BUILD_ROOT
 
 # no static modules
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/{gtk-2.0/modules/at-spi-corba/modules,orbit-2.0}/*.{la,a}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %py_postclean
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%{__mv} -f $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
 
 %find_lang %{name}
 
diff --git a/at-spi-ac.patch b/at-spi-ac.patch
new file mode 100644
index 0000000..72cb43c
--- /dev/null
+++ b/at-spi-ac.patch
@@ -0,0 +1,11 @@
+--- at-spi-1.32.0/configure.in.orig	2023-12-30 14:16:06.812260887 +0100
++++ at-spi-1.32.0/configure.in	2023-12-30 14:16:10.828905794 +0100
+@@ -69,7 +69,7 @@ AM_GLIB_GNU_GETTEXT
+ 
+ # AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME
+ # this is the directory where the *.{mo,gmo} files are installed
+-localedir='${prefix}/${DATADIRNAME}/locale'
++localedir='${prefix}/'${DATADIRNAME}'/locale'
+ AC_SUBST(localedir)
+ 
+ GTK_DOC_CHECK([1.0])
diff --git a/at-spi-gtkdoc.patch b/at-spi-gtkdoc.patch
new file mode 100644
index 0000000..5c05d04
--- /dev/null
+++ b/at-spi-gtkdoc.patch
@@ -0,0 +1,10 @@
+--- at-spi-1.32.0/gtk-doc.make.orig	2010-09-27 10:47:26.000000000 +0200
++++ at-spi-1.32.0/gtk-doc.make	2020-01-12 10:31:48.969058046 +0100
+@@ -98,7 +98,6 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ 	@echo 'gtk-doc: Rebuilding template files'
+ 	@-chmod -R u+w $(srcdir)
+-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ 	@touch tmpl-build.stamp
+ 
+ tmpl.stamp: tmpl-build.stamp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/at-spi.git/commitdiff/c5cdccd381d6c04d2745beb1799e223f9e025689