From bc77e178716047ba702b9a80254c6618914f76e6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Oct 06 2009 03:42:36 +0000
Subject: fix at-spi-registry autostart file


---

diff --git a/gdm.spec b/gdm.spec
index b130841..36b5835 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -98,6 +98,8 @@ Patch3: gdm-2.23.92-save-root-window.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596569
 Patch4: gdm-2.28.0-use-devicekit-power.patch
 
+Patch5: registryd-no-wrapper.patch
+
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
 # https://bugzilla.gnome.org/show_bug.cgi?id=572765
@@ -147,6 +149,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
 %patch4 -p1 -b .use-devicekit-power
+%patch5 -p1 -b .registryd-no-wrapper
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
@@ -401,6 +404,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.28.4-6
+- Fix the autostart file for at-spi-registryd
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.28.4-5
 - Handle keyboard layout variants
 
diff --git a/registryd-no-wrapper.patch b/registryd-no-wrapper.patch
new file mode 100644
index 0000000..48a7f84
--- /dev/null
+++ b/registryd-no-wrapper.patch
@@ -0,0 +1,30 @@
+diff -up gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.registryd-no-wrapper gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
+--- gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.registryd-no-wrapper	2009-10-05 23:34:13.222648781 -0400
++++ gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in	2009-10-05 23:35:09.702413116 -0400
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=AT SPI Registry Wrapper
+-Exec=@LIBDIR@/gnome-session/helpers/at-spi-registryd-wrapper
++Exec=/usr/libexec/at-spi-registryd
+ OnlyShowIn=GNOME;
+ AutostartCondition=GNOME /desktop/gnome/interface/accessibility
+ X-GNOME-Autostart-Phase=Initialization
+-X-GNOME-AutoRestart=true
+\ No newline at end of file
++X-GNOME-AutoRestart=true
+diff -up gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.registryd-no-wrapper gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
+--- gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.registryd-no-wrapper	2009-10-05 23:35:38.035399160 -0400
++++ gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in	2009-10-05 23:36:13.691664097 -0400
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=AT SPI Registry Wrapper
+-Exec=/usr/lib/gnome-session/helpers/at-spi-registryd-wrapper
++Exec=/usr/libexec/at-spi-registryd
+ OnlyShowIn=GNOME;
+ AutostartCondition=GNOME /desktop/gnome/interface/accessibility
+ X-GNOME-Autostart-Phase=Initialization
+-X-GNOME-AutoRestart=true
+\ No newline at end of file
++X-GNOME-AutoRestart=true