From d72c5662038dcb783a646ce100b4578ee3619a482921be116ae715b7f073c3d3 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 29 Dec 2009 18:02:38 +0000
Subject: [PATCH] Accepting request 27801 from GNOME:Factory

Copy from GNOME:Factory/at-spi2-core based on submit request 27801 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/27801
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/at-spi2-core?expand=0&rev=4
---
 at-spi2-core-0.1.3.tar.bz2   |  3 ---
 at-spi2-core-0.1.4.tar.bz2   |  3 +++
 at-spi2-core-dbus-path.patch | 13 +++++++++++++
 at-spi2-core.changes         | 22 ++++++++++++++++++++++
 at-spi2-core.spec            | 14 +++++++++++---
 5 files changed, 49 insertions(+), 6 deletions(-)
 delete mode 100644 at-spi2-core-0.1.3.tar.bz2
 create mode 100644 at-spi2-core-0.1.4.tar.bz2
 create mode 100644 at-spi2-core-dbus-path.patch

diff --git a/at-spi2-core-0.1.3.tar.bz2 b/at-spi2-core-0.1.3.tar.bz2
deleted file mode 100644
index 869cfac..0000000
--- a/at-spi2-core-0.1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:240fc00dfd1e48472796e5507e6e20768fd36c0a50012dbcbd06eae9e49c3604
-size 319178
diff --git a/at-spi2-core-0.1.4.tar.bz2 b/at-spi2-core-0.1.4.tar.bz2
new file mode 100644
index 0000000..89837db
--- /dev/null
+++ b/at-spi2-core-0.1.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66913fb35a44d09d1c97d857f656a845bdf1d1f0800ffb25c017c9326d77e0f1
+size 324206
diff --git a/at-spi2-core-dbus-path.patch b/at-spi2-core-dbus-path.patch
new file mode 100644
index 0000000..f0df0ee
--- /dev/null
+++ b/at-spi2-core-dbus-path.patch
@@ -0,0 +1,13 @@
+Index: at-spi2-core-0.1.4/bus/accessibility.conf
+===================================================================
+--- at-spi2-core-0.1.4.orig/bus/accessibility.conf
++++ at-spi2-core-0.1.4/bus/accessibility.conf
+@@ -7,7 +7,7 @@
+ 
+   <standard_system_servicedirs/>
+ 
+-  <servicehelper>/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>
++  <servicehelper>/lib/dbus-1/dbus-daemon-launch-helper</servicehelper>
+ 
+   <auth>EXTERNAL</auth>
+ 
diff --git a/at-spi2-core.changes b/at-spi2-core.changes
index 8c3d1c5..7d0328a 100644
--- a/at-spi2-core.changes
+++ b/at-spi2-core.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Dec 22 17:12:38 CET 2009 - vuntz@opensuse.org
+
+- Update to version 0.1.4:
+  + For the full list of changes, see
+    http://git.gnome.org/cgit/at-spi2-core/log/?id=AT_SPI2_CORE_0_1_4
+  + Use the new 'Accessibility' bus if the bus address is available
+    on the X property AT_SPI_BUS.
+  + Add command line option to enable interaction with the gnome
+    session manager.
+  + Add the configure file for the (non-secure) accessibility bus.
+  + Use datarootdir for placing XML files so that the are in a
+    shared directory not under the name of this module but
+    'at-spi2'.
+  + Make sure the d-bus bus configuration is included in the
+    distribution.
+  + Add a configure variable for the location of the dbus-daemon in
+    the at-spi-dbus-bus script.
+- Pass --with-dbus-daemondir to configure.
+- Add at-spi2-core-dbus-path.patch to use the right path for a dbus
+  helper.
+
 -------------------------------------------------------------------
 Wed Dec  2 17:17:48 CET 2009 - vuntz@opensuse.org
 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 559c996..7431207 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package at-spi2-core (Version 0.1.3)
+# spec file for package at-spi2-core (Version 0.1.4)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           at-spi2-core
-Version:        0.1.3
+Version:        0.1.4
 Release:        1
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation
 License:        GPLv2+
@@ -26,6 +26,8 @@ Group:          System/Libraries
 Url:            http://www.gnome.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM at-spi2-core-dbus-path.patch vuntz@opensuse.org -- Use the right path for a dbus helper. This will be fixed upstream in a more generic way
+Patch0:         at-spi2-core-dbus-path.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  update-desktop-files
@@ -46,15 +48,18 @@ with applications running on the desktop.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
         --libexecdir=%{_libexecdir}/at-spi2 \
+        --with-dbus-daemondir=/bin \
         --disable-static
 %__make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
+%suse_update_desktop_file at-spi-dbus-bus
 
 %clean
 rm -rf %{buildroot}
@@ -66,8 +71,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
-%{_datadir}/%{name}/
+%{_bindir}/at-spi-dbus-bus
 %{_libexecdir}/at-spi2/
+%{_sysconfdir}/at-spi2/
+%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
+%{_datadir}/at-spi2/
 %{_datadir}/dbus-1/services/org.freedesktop.atspi.Registry.service
 
 %changelog