[gnome-settings-daemon/f14/master] fix display capplet invocation

[Matthias Clasen]

commit 95524d8ee07cce0a576b5e936b16c9b55df71ded
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 1 14:40:24 2010 -0400

    fix display capplet invocation

 display-capplet.patch      |   12 ++++++++++++
 gnome-settings-daemon.spec |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/display-capplet.patch b/display-capplet.patch
new file mode 100644
index 0000000..0893144
--- /dev/null
+++ b/display-capplet.patch
@@ -0,0 +1,12 @@
+diff -up gnome-settings-daemon-2.31.91/plugins/xrandr/gsd-xrandr-manager.c.capplet gnome-settings-daemon-2.31.91/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.31.91/plugins/xrandr/gsd-xrandr-manager.c.capplet	2010-09-01 14:25:51.121940001 -0400
++++ gnome-settings-daemon-2.31.91/plugins/xrandr/gsd-xrandr-manager.c	2010-09-01 14:26:06.346940001 -0400
+@@ -76,7 +76,7 @@
+ #define GSD_XRANDR_ICON_NAME "gsd-xrandr"
+ 
+ /* executable of the control center's display configuration capplet */
+-#define GSD_XRANDR_DISPLAY_CAPPLET "gnome-control-center display"
++#define GSD_XRANDR_DISPLAY_CAPPLET "gnome-display-properties"
+ 
+ #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+ #define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 7a5510f..0269ddd 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        2.31.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -39,6 +39,9 @@ Patch3: slight-hinting.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=610319
 Patch4: keyboard-icon.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=628538
+Patch5: display-capplet.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -57,6 +60,7 @@ developing applications that use %{name}.
 %setup -q
 %patch3 -p1 -b .slight-hinting
 %patch4 -p1 -b .keyboard-icon
+%patch5 -p1 -b .display-capplet
 
 %build
 # https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
@@ -116,6 +120,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep  1 2010 Matthias Clasen <mclasen at redhat.com> 2.31.91-2
+- Fix display capplet invokation (#628835)
+
 * Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> 2.31.91-1
 - Update to 2.31.91