Accepting request 53480 from GNOME:Factory

Accepted submit request 53480 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/53480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=57
This commit is contained in:
Ruediger Oertel 2010-11-20 11:00:53 +00:00 committed by Git OBS Bridge
commit 114f93bf17
5 changed files with 19 additions and 30 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5eb0270028f072e8d36c61e4677d55844669d9ab09d525f6c76b4980ec81c9e
size 1322416

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
size 1331850

View File

@ -1,22 +0,0 @@
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,17 @@
-------------------------------------------------------------------
Tue Nov 16 09:27:00 CET 2010 - dimstar@opensuse.org
- Update to version 2.32.1:
+ Revert calling g-c-c 3.0's display configuration tool
+ Use the fallback configurations if the stored configuration
fails at startup
+ Don't access free'd memory if a volume is unmounted whilst
the dialog is displayed
+ bgo#631388: Add gconf key for disabling boot time configuration
+ Use Xorg monitor settings by default
+ Updated translations.
- Drop gnome-settings-daemon-display-tool.patch: fixed upstream.
-------------------------------------------------------------------
Mon Sep 27 16:35:15 CEST 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-settings-daemon (Version 2.32.0)
# spec file for package gnome-settings-daemon (Version 2.32.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,15 +18,13 @@
Name: gnome-settings-daemon
Version: 2.32.0
Version: 2.32.1
Release: 1
License: GPLv2+
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.
@ -112,7 +110,6 @@ 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