From 537ca6015e927118a2ff3df1a600100bd31a7e542b8fdc25d839387a52052c40 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 5 Mar 2010 10:49:33 +0000
Subject: [PATCH] Accepting request 33848 from GNOME:Factory

checked in (request 33848)

OBS-URL: https://build.opensuse.org/request/show/33848
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=21
---
 at-spi2-core-0.1.6.tar.bz2  |  3 +++
 at-spi2-core-0.1.7.tar.bz2  |  3 ---
 at-spi2-core-non_void.patch | 34 ----------------------------------
 at-spi2-core.changes        | 17 -----------------
 at-spi2-core.spec           | 10 ++++------
 5 files changed, 7 insertions(+), 60 deletions(-)
 create mode 100644 at-spi2-core-0.1.6.tar.bz2
 delete mode 100644 at-spi2-core-0.1.7.tar.bz2
 delete mode 100644 at-spi2-core-non_void.patch

diff --git a/at-spi2-core-0.1.6.tar.bz2 b/at-spi2-core-0.1.6.tar.bz2
new file mode 100644
index 0000000..25c1548
--- /dev/null
+++ b/at-spi2-core-0.1.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a52c0d23d8cf656f0cd6986394baebc1f0f60fc41b0a2c9ea80967b21c3c7277
+size 325920
diff --git a/at-spi2-core-0.1.7.tar.bz2 b/at-spi2-core-0.1.7.tar.bz2
deleted file mode 100644
index e49f7ed..0000000
--- a/at-spi2-core-0.1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9d6263357ddb7583789105d3ec6b764b51643777fa55409024eab1807592b74
-size 282192
diff --git a/at-spi2-core-non_void.patch b/at-spi2-core-non_void.patch
deleted file mode 100644
index 543b03e..0000000
--- a/at-spi2-core-non_void.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- registryd/registry.c
-+++ registryd/registry.c
-@@ -99,6 +99,7 @@
-                                     &variant);
-     dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str);
-   dbus_message_iter_close_container (iter, &variant);
-+  return TRUE;
- }
- 
- static void
-@@ -440,6 +441,7 @@
-   dbus_int32_t rv = reg->apps->len;
- 
-   dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &rv);
-+  return TRUE;
- }
- 
- static DBusMessage *
-@@ -755,6 +757,7 @@
- {
-   emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "add", index, 0,
-               name, path);
-+  return TRUE;
- }
- 
- static gboolean
-@@ -765,6 +768,7 @@
- {
-   emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0,
-               name, SPI_DBUS_PATH_NULL);
-+  return TRUE;
- }
- 
- /*---------------------------------------------------------------------------*/
diff --git a/at-spi2-core.changes b/at-spi2-core.changes
index 549c15a..1fdc678 100644
--- a/at-spi2-core.changes
+++ b/at-spi2-core.changes
@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Tue Mar  2 00:38:02 CET 2010 - ro@suse.de
-
-- fix warning: no return statement in function returning non-void
-  in registry.c to fix build 
-
--------------------------------------------------------------------
-Sun Feb 21 17:24:28 CET 2010 - vuntz@opensuse.org
-
-- Update to version 0.1.7:
-  + Completely re-work the protocol definitions.
-  + Make the desktop object and deviceeventcontroller
-    introspectable.
-  + Add the XML files to the distribution.
-  + Modify the interface name from org.freedesktop.atspi to
-    org.a11y.atspi.
-
 -------------------------------------------------------------------
 Fri Feb 12 15:05:12 CET 2010 - vuntz@opensuse.org
 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 8067c16..968b196 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.7)
+# spec file for package at-spi2-core (Version 0.1.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           at-spi2-core
-Version:        0.1.7
+Version:        0.1.6
 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
@@ -29,8 +29,6 @@ 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
-# PATCH-FIX-UPSTREAM at-spi2-core-non_void.patch fdo#26855 ro@novell.com -- Fix compiler warnings no-return-in-non-void-function.
-Patch1:         at-spi2-core-non_void.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  glib2-devel
 BuildRequires:  xorg-x11-devel
@@ -52,7 +50,6 @@ with applications running on the desktop.
 
 %prep
 %setup -q
-%patch1
 # Reapply when bus/ is shipped again in the tarball
 #%patch0 -p1
 
@@ -82,6 +79,7 @@ rm -rf %{buildroot}
 %{_libexecdir}/at-spi2/
 #%{_sysconfdir}/at-spi2/
 #%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
-%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service
+%{_datadir}/at-spi2/
+%{_datadir}/dbus-1/services/org.freedesktop.atspi.Registry.service
 
 %changelog