rpms/at-spi/devel corba-vs-dbus.patch, NONE, 1.1 at-spi.spec, 1.127, 1.128

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25747

Modified Files:
	at-spi.spec 
Added Files:
	corba-vs-dbus.patch 
Log Message:
improve corba/dbus switching


corba-vs-dbus.patch:
 b/configure.in               |    1 -
 b/pyatspi/Makefile.am        |   10 +---------
 pyatspi/pyatspi-corba.pth.in |    2 --
 3 files changed, 1 insertion(+), 12 deletions(-)

--- NEW FILE corba-vs-dbus.patch ---
>From b09602535778a109ad246b45ab5766608239b2d9 Mon Sep 17 00:00:00 2001
From: Willie Walker <william.walker at sun.com>
Date: Wed, 6 Jan 2010 13:46:16 -0500
Subject: [PATCH] Move decision to use CORBA vs. D-Bus into D-Bus's pyatspi module.
 Install to Python bindings into the Python pyatspi_corba module by
 default, but use --disable-relocate to install into the Python
 pyatspi module.

---
 configure.in                 |    1 -
 pyatspi/Makefile.am          |   10 +---------
 pyatspi/pyatspi-corba.pth.in |    1 -
 3 files changed, 1 insertions(+), 11 deletions(-)
 delete mode 100644 pyatspi/pyatspi-corba.pth.in

diff --git a/configure.in b/configure.in
index cf7371f..c557465 100644
--- a/configure.in
+++ b/configure.in
@@ -272,7 +272,6 @@ cspi/Makefile
 cspi/bonobo/Makefile
 pyatspi/Makefile
 pyatspi/__init__.py
-pyatspi/pyatspi-corba.pth
 ])
 
 echo "AT-SPI setup:
diff --git a/pyatspi/Makefile.am b/pyatspi/Makefile.am
index 5c3abdb..0c13d0b 100644
--- a/pyatspi/Makefile.am
+++ b/pyatspi/Makefile.am
@@ -7,15 +7,7 @@ pyatspi_PYTHON = \
 	utils.py
 
 if RELOCATE
-    pyatspidir=$(pyexecdir)/pyatspi-corba/pyatspi
+    pyatspidir=$(pyexecdir)/pyatspi_corba
 else
     pyatspidir=$(pyexecdir)/pyatspi
 endif
-
-if RELOCATE
-install-exec-local:
-	@$(MKDIR_P) $(DESTDIR)$(pyexecdir)
-	cp pyatspi-corba.pth $(DESTDIR)$(pyexecdir)
-uninstall-local:
-	@rm $(DESTDIR)$(pyexecdir)/pyatspi-corba.pth
-endif
diff --git a/pyatspi/pyatspi-corba.pth.in b/pyatspi/pyatspi-corba.pth.in
deleted file mode 100644
index e816e6a..0000000
--- a/pyatspi/pyatspi-corba.pth.in
+++ /dev/null
@@ -1 +0,0 @@
-import commands, sys; a = commands.getoutput('gconftool-2 --get /desktop/gnome/interface/at-spi-corba'); (a == 'true') and sys.path.insert(0, '@prefix@/lib/python at PYTHON_VERSION@/site-packages/pyatspi-corba')
-- 
1.5.6.5




Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- at-spi.spec	5 Dec 2009 06:00:04 -0000	1.127
+++ at-spi.spec	7 Jan 2010 00:10:32 -0000	1.128
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.29.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.29/%{name}-%{version}.tar.bz2
 
@@ -49,6 +49,9 @@ BuildRequires: automake, autoconf, libto
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
 Patch0: evo-crash.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=606251
+Patch1: corba-vs-dbus.patch
+
 %description
 at-spi allows assistive technologies to access GTK-based
 applications. Essentially it exposes the internals of applications for
@@ -85,6 +88,7 @@ This package contains Python bindings al
 %prep
 %setup -q
 %patch0 -p1 -b .evo-crash
+%patch1 -p1 -b .corba-vs-dbus
 
 autoreconf -i -f
 
@@ -154,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan  6 2010 Matthias Clasen <mclasen at redhat.com> - 1.29.3-3
+- Improve Corba/DBus switching in pyatspi
+
 * Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-2
 - Undo the relocation for now