Accepting request 47145 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 47145 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/47145
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=69
This commit is contained in:
Vincent Untz 2010-09-04 20:54:07 +00:00 committed by Git OBS Bridge
parent f617ea214b
commit 79d18530a1
3 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,22 @@
commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee
Author: Matthias Clasen <mclasen@redhat.com>
Date: Wed Jun 16 08:17:45 2010 -0400
Fix launching the display configuration tool
It is a control-center panel now, not a standalone capplet anymore.
Adjust the commandline accordingly.
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 7f406b1..7f66cd2 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -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-display-properties"
+#define GSD_XRANDR_DISPLAY_CAPPLET "gnome-control-center display"
#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Sep 4 22:41:36 CEST 2010 - vuntz@opensuse.org
- Add gnome-settings-daemon-display-tool.patch to fix the display
notification area to use the right tool to configure display. The
patch reverts a commit that is GNOME 3-only. Fix bnc#636849.
-------------------------------------------------------------------
Tue Aug 31 15:03:22 CEST 2010 - dimstar@opensuse.org

View File

@ -25,6 +25,8 @@ Summary: Settings daemon for the GNOME desktop
Url: http://www.gnome.org
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-settings-daemon-display-tool.patch bnc#636849 bgo#628792 vuntz@opensuse.org -- Fix launch of display tool, revert upstream commit that changed it (was a GNOME 3 commit)
Patch0: gnome-settings-daemon-display-tool.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff
Patch2: gnome-settings-daemon-system-proxy-configuration.diff
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
@ -103,6 +105,7 @@ contact the settings daemon via its DBus interface.
%setup -q
translation-update-upstream
gnome-patch-translation-prepare
%patch0 -p1 -R
%patch2 -p0
%patch6 -p0
%patch8 -p0