From 1994e5031b6b3b6be239de3d5d514f784008224d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 2 Jun 2010 14:10:31 +0000
Subject: [PATCH] don't relocate the dbus a11y stack add upstream fixes to make
 caribou work

---
 make-caribou-work.patch | 57 +++++++++++++++++++++++++++++++++++++++++
 pyatspi.spec            |  8 ++++--
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 make-caribou-work.patch

diff --git a/make-caribou-work.patch b/make-caribou-work.patch
new file mode 100644
index 0000000..a3481db
--- /dev/null
+++ b/make-caribou-work.patch
@@ -0,0 +1,57 @@
+diff -up pyatspi-0.3.2/pyatspi/appevent.py.caribou pyatspi-0.3.2/pyatspi/appevent.py
+--- pyatspi-0.3.2/pyatspi/appevent.py.caribou	2010-06-02 09:40:28.908726573 -0400
++++ pyatspi-0.3.2/pyatspi/appevent.py	2010-06-02 09:51:36.593484219 -0400
+@@ -283,11 +283,11 @@ class Event(object):
+ 
+         @property
+         def source_name(self):
+-                return source.name
++                return self.source.name
+ 
+         @property
+         def source_role(self):
+-                return source.getRole()
++                return self.source.getRole()
+ 
+         def __str__(self):
+                 """
+diff -up pyatspi-0.3.2/pyatspi/text.py.caribou pyatspi-0.3.2/pyatspi/text.py
+--- pyatspi-0.3.2/pyatspi/text.py.caribou	2010-06-02 09:52:17.637502240 -0400
++++ pyatspi-0.3.2/pyatspi/text.py	2010-06-02 09:52:58.568477306 -0400
+@@ -249,7 +249,7 @@ class Text(Accessible):
+                 func = self.get_dbus_method("GetCharacterAtOffset", dbus_interface=ATSPI_TEXT)
+                 return func(offset)
+ 
+-        def getCharacterExtents(self, offset, x, y, width, height, coordType):
++        def getCharacterExtents(self, offset, coordType):
+                 """
+                 Obtain a the bounding box, as x, y, width, and height, of the
+                 character or glyph at a particular character offset in this object's
+@@ -260,18 +260,6 @@ class Text(Accessible):
+                 and therefore may apply to more than one character offset. 
+                 @param : offset
+                 the character offset of the character or glyph being queried.
+-                @param : x
+-                the minimum horizontal coordinate of the bounding box of the
+-                glyph representing the character at offset. 
+-                @param : y
+-                the minimum vertical coordinate of the bounding box of the glyph
+-                representing the character at offset. 
+-                @param : width
+-                the horizontal extent of the bounding box of the glyph representing
+-                the character at offset. 
+-                @param : height
+-                the vertical extent of the bounding box of the glyph representing
+-                the character at offset. 
+                 @param : coordType
+                 If 0, the results will be reported in screen coordinates, i.e.
+                 in pixels relative to the upper-left corner of the screen, with
+@@ -281,7 +269,7 @@ class Text(Accessible):
+                 down.
+                 """
+                 func = self.get_dbus_method("GetCharacterExtents", dbus_interface=ATSPI_TEXT)
+-                return func(offset, x, y, width, height, UInt32(coordType))
++                return func(offset, UInt32(coordType))
+ 
+         def getDefaultAttributeSet(self):
+                 """
diff --git a/pyatspi.spec b/pyatspi.spec
index 42f4915..3610399 100644
--- a/pyatspi.spec
+++ b/pyatspi.spec
@@ -4,7 +4,7 @@
 
 Name:           pyatspi
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for at-spi
 
 Group:          Development/Languages
@@ -13,6 +13,9 @@ URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 #VCS: git:git://git.gnome.org/pyatspi
 Source0:        http://download.gnome.org/sources/pyatspi/0.3/%{name}-%{version}.tar.bz2
 
+# upstream fixes
+Patch0: make-caribou-work.patch
+
 BuildRequires:  python
 
 Requires:       GConf2
@@ -35,10 +38,11 @@ This package includes a python client library for at-spi.
 
 %prep
 %setup -q
+%patch0 -p1 -b .make-caribou-work
 
 
 %build
-%configure --enable-relocate
+%configure
 make