From 5986721508d8913162b5b92848be7bd7730331df Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sep 15 2010 01:37:53 +0000
Subject: Introspection patches backported from master


---

diff --git a/atk.spec b/atk.spec
index ddb84d8..665d88a 100644
--- a/atk.spec
+++ b/atk.spec
@@ -4,11 +4,12 @@
 Summary: Interfaces for accessibility support
 Name: atk
 Version: 1.30.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/atk
 Source: http://download.gnome.org/sources/atk/1.30/atk-%{version}.tar.bz2
+Source2: autogen.sh
 URL: http://developer.gnome.org/projects/gap/
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils
@@ -17,6 +18,10 @@ BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 # Bootstrap requirements
 BuildRequires: gnome-common gtk-doc
 
+# Cherrypicked from upstream
+Patch1: 0001-Fix-build-problem-with-jhbuild.patch
+Patch2: 0001-introspection-Associate-.gir-with-pkg-config-file.patch
+
 %description
 The ATK library provides a set of interfaces for adding accessibility
 support to applications and graphical user interface toolkits. By
@@ -37,8 +42,14 @@ needed for development of applications or toolkits which use ATK.
 
 %prep
 %setup -q
+cp %{SOURCE2} .
+chmod a+x %{SOURCE2}
+%patch1 -p1
+%patch2 -p1
 
 %build
+# Force a bootstrap since we're patching a .am file
+rm configure
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS)
 make %{?_smp_mflags}
@@ -73,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0
 
 %changelog
+* Tue Sep 14 2010 Colin Walters <walters@verbum.org> - 1.30.0-6
+- introspection: Add patch to export pkg-config file; necessary
+  for dependent packages to build with introspection.
+
 * Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 1.30.0-5
 - Rebuild with new gobject-introspection