Accepting request 37430 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/python-atspi via accept of submit request 37430 revision 3.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/37430
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-atspi?expand=0&rev=16

python-atspi.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr  8 01:41:45 CEST 2010 - vuntz@opensuse.org
+
+- Make this new at-spi stack optional again: the at-spi2 developers
+  think it's safer to ship 11.3 with the old stack by default.
+- Add a IS_DEFAULT_ATSPI_STACK define to easily change this
+  behavior.
+
 -------------------------------------------------------------------
 Wed Mar 31 01:27:30 CEST 2010 - vuntz@opensuse.org
 

python-atspi.spec

@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%define IS_DEFAULT_ATSPI_STACK 0
 
 Name:           python-atspi
 %define _name   pyatspi
@@ -36,9 +36,11 @@ Requires:       python-gtk
 Recommends:     at-spi2-core
 # Old versions of at-spi 1.x provided the same files
 Conflicts:      at-spi < 1.29.3
-# Virtual package, so that it's possible to use either python-atspi or
-# python-atspi-corba
+%if %IS_DEFAULT_ATSPI_STACK
+# Virtual package, so that apps can depend on it, without having to know which
+# at-spi stack is used. Only the default at-spi stack should define it.
 Provides:       pyatspi
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %suse_version > 1110
 BuildArch:      noarch
@@ -58,9 +60,13 @@ This package contains the python bindings for AT-SPI.
 %setup -q -n %{_name}-%{version}
 
 %build
-# We pass --disable-relocate since we want at-spi2 by default.
+# We pass --enable-relocate when we want another at-spi stack (like at-spi) by default.
 %configure \
+%if %IS_DEFAULT_ATSPI_STACK
         --disable-relocate
+%else
+        --enable-relocate
+%endif
 %__make %{?jobs:-j%jobs}
 
 %install
@@ -73,6 +79,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
+%if %IS_DEFAULT_ATSPI_STACK
 %{python_sitelib}/pyatspi/
+%else
+%{python_sitelib}/pyatspi_dbus/
+%endif
 
 %changelog