From 561dfa6be227a1885f92a0a75a9fd6451042b1d8cc3718ee55c714ef4fa41c21 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Sat, 11 Sep 2010 09:24:46 +0000
Subject: [PATCH] Accepting request 47720 from GNOME:Factory

checked in (request 47720)

OBS-URL: https://build.opensuse.org/request/show/47720
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=32
---
 at-spi2-core-0.3.90.tar.bz2  |  3 +++
 at-spi2-core-0.3.91.tar.bz2  |  3 ---
 at-spi2-core-dbus-path.patch | 13 +++++++++++++
 at-spi2-core.changes         | 14 --------------
 at-spi2-core.spec            | 18 ++++++++++++------
 5 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 at-spi2-core-0.3.90.tar.bz2
 delete mode 100644 at-spi2-core-0.3.91.tar.bz2
 create mode 100644 at-spi2-core-dbus-path.patch

diff --git a/at-spi2-core-0.3.90.tar.bz2 b/at-spi2-core-0.3.90.tar.bz2
new file mode 100644
index 0000000..dfc11a0
--- /dev/null
+++ b/at-spi2-core-0.3.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ee74fc3ccbd5045858e00c8067492f8401cd8258724128f1a699ab23b7bdfdc
+size 275120
diff --git a/at-spi2-core-0.3.91.tar.bz2 b/at-spi2-core-0.3.91.tar.bz2
deleted file mode 100644
index 783c588..0000000
--- a/at-spi2-core-0.3.91.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e888d01ea9649e2ab5c6ce553c3f4236b64fc0223de2fd80519aaac92bbe421
-size 277201
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 e176a68..99fb46f 100644
--- a/at-spi2-core.changes
+++ b/at-spi2-core.changes
@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Tue Aug 31 08:57:06 CEST 2010 - vuntz@opensuse.org
-
-- Update to version 0.3.91:
-  + Enabled the accessibility bus, so apps should be accessible,
-    for instance, if an application becomes setuid root.
-  + Several build fixes.
-  + Default to --enable-relocate for now.
-- Drop at-spi2-core-dbus-path.patch: this is not needed anymore
-  since the path to the dbus daemon is not in the config file
-  anymore.
-- Uncomment call to %suse_update_desktop_file for
-  at-spi-dbus-bus.desktop.
-
 -------------------------------------------------------------------
 Tue Aug 17 10:56:59 CEST 2010 - dimstar@opensuse.org
 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index bc9195c..62af274 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package at-spi2-core (Version 0.3.91)
+# spec file for package at-spi2-core (Version 0.3.90)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,14 +18,17 @@
 
 
 Name:           at-spi2-core
-Version:        0.3.91
+Version:        0.3.90
 Release:        1
+# FIXME: check that tarballs > 0.1.6 ship bus/ directory, and if they do, reapply patch0 and call to suse_update_desktop_file
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation
 License:        GPLv2+
 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:  glib2-devel
 BuildRequires:  xorg-x11-devel
@@ -47,6 +50,8 @@ with applications running on the desktop.
 
 %prep
 %setup -q
+# Reapply when bus/ is shipped again in the tarball
+#%patch0 -p1
 
 %build
 %configure \
@@ -57,7 +62,7 @@ with applications running on the desktop.
 
 %install
 %makeinstall
-%suse_update_desktop_file at-spi-dbus-bus
+#suse_update_desktop_file at-spi-dbus-bus
 
 %clean
 rm -rf %{buildroot}
@@ -69,10 +74,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
-%{_bindir}/at-spi-dbus-bus
+#Commented out files are files used with the bus, they should come back later
+#%{_bindir}/at-spi-dbus-bus
 %{_libexecdir}/at-spi2/
-%{_sysconfdir}/at-spi2/
-%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
+#%{_sysconfdir}/at-spi2/
+#%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
 %{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service
 
 %changelog