From 645d7106e381ad9b20ab6e4223b86e2121a23660 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mar 10 2011 00:07:13 +0000
Subject: fix a crash on logout


---

diff --git a/at-spi2-core-crash-on-exit.patch b/at-spi2-core-crash-on-exit.patch
new file mode 100644
index 0000000..1563331
--- /dev/null
+++ b/at-spi2-core-crash-on-exit.patch
@@ -0,0 +1,12 @@
+diff -up at-spi2-core-1.91.91/registryd/registry-main.c.crash-on-exit at-spi2-core-1.91.91/registryd/registry-main.c
+--- at-spi2-core-1.91.91/registryd/registry-main.c.crash-on-exit	2011-03-09 19:05:00.774019630 -0500
++++ at-spi2-core-1.91.91/registryd/registry-main.c	2011-03-09 19:05:09.305912968 -0500
+@@ -98,7 +98,7 @@ kill_accessibility_bus ()
+   home = getenv ("HOME");
+   if (!home)
+     return;
+-  name = g_strconcat (home, "/", ".atspi-dbus-bus.pid");
++  name = g_strconcat (home, "/", ".atspi-dbus-bus.pid", NULL);
+   if (!name)
+     return;
+ 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 1695c58..7ca1a81 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,6 +1,6 @@
 Name:           at-spi2-core
 Version:        1.91.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Protocol definitions and daemon for D-Bus at-spi
 
 Group:          System Environment/Libraries
@@ -8,6 +8,9 @@ License:        LGPLv2+
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 Source0:        http://download.gnome.org/sources/at-spi2-core/1.91/%{name}-%{version}.tar.bz2
 
+# upstream fix
+Patch0:         at-spi2-core-crash-on-exit.patch
+
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  glib2-devel
@@ -45,6 +48,7 @@ API documentation for libatspi.
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash-on-exit
 
 %build
 %configure --with-dbus-daemondir=/bin
@@ -86,6 +90,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la
 %{_includedir}/at-spi-2.0
 
 %changelog
+* Wed Mar  9 2011 Matthias Clasen <mclasen@redhat.com> - 1.91.91-2
+- Fix a crash on logout
+
 * Mon Mar  7 2011 Matthias Clasen <mclasen@redhat.com> - 1.91.91-1
 - Update to 1.91.91