[at-spi2-core/f18] Add patch to fix building introspection without rpath shenanigans

[rtcm]

commit a8af56c5fa9fae9f16d84350ff6cc29f56cfbb50
Author: Rui Matos <tiagomatos at gmail.com>
Date:   Tue Nov 27 15:38:45 2012 +0100

    Add patch to fix building introspection without rpath shenanigans

 at-spi2-core.spec     |   12 ++++++--
 use-gi-makefile.patch |   67 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)
---
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index a0e7331..19cb1e6 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,12 +1,13 @@
 Name:           at-spi2-core
 Version:        2.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Protocol definitions and daemon for D-Bus at-spi
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 Source0:        http://download.gnome.org/sources/at-spi2-core/2.6/%{name}-%{version}.tar.xz
+Patch0:         use-gi-makefile.patch
 
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
@@ -42,12 +43,13 @@ API documentation for libatspi.
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-gi-makefile
+
+autoreconf -i -f
 
 %build
 %configure --with-dbus-daemondir=/bin
 
-sed -i -e 's+sys_lib_dlsearch_path_spec="/lib /usr/lib+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64+' configure
-
 make %{?_smp_mflags}
 
 
@@ -81,6 +83,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la
 %{_libdir}/pkgconfig/atspi-2.pc
 
 %changelog
+* Tue Nov 27 2012 Rui Matos <rmatos at redhat.com> - 2.6.2-2
+- Add patch from upstream to fix building introspection without rpath
+  shenanigans
+
 * Mon Nov 12 2012 Kalev Lember <kalevlember at gmail.com> - 2.6.2-1
 - Update to 2.6.2
 
diff --git a/use-gi-makefile.patch b/use-gi-makefile.patch
new file mode 100644
index 0000000..c3b4113
--- /dev/null
+++ b/use-gi-makefile.patch
@@ -0,0 +1,67 @@
+diff --git a/atspi/Makefile.am b/atspi/Makefile.am
+index 8a26430..f89d13a 100644
+--- a/atspi/Makefile.am
++++ b/atspi/Makefile.am
+@@ -109,42 +109,32 @@ libatspi_la_SOURCES =		\
+ #atspi-constants.h: $(top_srcdir)/xml/spec.xml $(top_srcdir)/tools/c-constants-gen.py
+ #	python $(top_srcdir)/tools/c-constants-gen.py Atspi $(top_srcdir)/xml/spec.xml atspi-constants
+ 
++-include $(INTROSPECTION_MAKEFILE)
++INTROSPECTION_GIRS =
++INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
++
+ if HAVE_INTROSPECTION
+-INTROSPECTION_FILES = $(libatspi_la_SOURCES)
+-
+-Atspi-2.0.gir: $(INTROSPECTION_SCANNER) \
+-		libatspi.la \
+-		$(INTROSPECTION_FILES)
+-	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+-		--namespace Atspi \
+-		--nsversion=2.0 \
+-		-I$(top_builddir) \
+-		-I$(top_srcdir) \
+-		--include=GLib-2.0 \
+-		--include=GObject-2.0 \
+-		--libtool="$(top_builddir)/libtool" \
+-		--library=libatspi.la \
+-		--library=$(top_builddir)/dbind/libdbind.la \
+-		--pkg dbus-1 \
+-		--warn-all \
+-		--output $@ \
+-		$(addprefix $(srcdir)/, $(INTROSPECTION_FILES))
+ 
+-girdir = $(datadir)/gir-1.0
+-gir_DATA = Atspi-2.0.gir
++Atspi-2.0.gir: libatspi.la
++Atspi_2_0_gir_INCLUDES = GLib-2.0 GObject-2.0
++Atspi_2_0_gir_PACKAGES = dbus-1
++Atspi_2_0_gir_EXPORT_PACKAGES = atspi-2
++Atspi_2_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir)
++Atspi_2_0_gir_LIBS = libatspi.la $(top_builddir)/dbind/libdbind.la
++Atspi_2_0_gir_FILES = $(libatspi_la_SOURCES)
++Atspi_2_0_gir_SCANNERFLAGS = --namespace Atspi --nsversion=2.0
++INTROSPECTION_SCANNER_ARGS += --c-include='atspi/atspi.h'
++INTROSPECTION_GIRS += Atspi-2.0.gir
+ 
+-%.typelib: %.gir $(INTROSPECTION_COMPILER)
+-	$(AM_V_GEN)$(top_builddir)/libtool --mode=execute \
+-	    $(INTROSPECTION_COMPILER) \
+-	        --includedir=$(srcdir) \
+-	        --includedir=. \
+-	        $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
++girdir = $(datadir)/gir-1.0
++gir_DATA = $(INTROSPECTION_GIRS)
+ 
+-typelibsdir = $(libdir)/girepository-1.0/
+-typelibs_DATA = $(gir_DATA:.gir=.typelib)
++typelibdir = $(libdir)/girepository-1.0
++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+ CLEANFILES = \
+     $(gir_DATA) \
+-    $(typelibs_DATA)
++    $(typelib_DATA)
+ 
+ endif