rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

Accepting request 47759 from GNOME:Factory

Browse Source 
checked in (request 47759)

OBS-URL: https://build.opensuse.org/request/show/47759
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=71
This commit is contained in:
OBS User autobuild 2010-09-13 10:18:44 +00:00 committed by Git OBS Bridge
parent adaaa00fe9
commit 7cb7a89863
5 changed files with 14 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-2.31.6.tar.bz2 Normal file
View File

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

3
gnome-settings-daemon-2.31.91.tar.bz2
View File

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

22
gnome-settings-daemon-display-tool.patch
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"

35
gnome-settings-daemon.changes
View File

@ -1,38 +1,3 @@
-------------------------------------------------------------------
Wed Sep 8 01:11:10 CEST 2010 - vuntz@opensuse.org
- Change old-style BuildRequires to pkgconfig() style
BuildRequires:
+ old-style: gnome-desktop-devel, libcanberra-devel,
libgnomekbd-devel, libnotify-devel, libpulse-devel,
mozilla-nss-devel, polkit-devel, xorg-x11.
+ new-style: dbus-glib-1, fontconfig, gconf-2.0, glib-2.0,
gnome-desktop-2.0, gtk+-2.0, libcanberra-gtk, libgnomekbd,
libgnomekbdui, libnotify, libpulse, libxklavier, nss,
polkit-gobject-1, xi.
- This will make it easier to switch to GNOME 3 libraries.
-------------------------------------------------------------------
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
- Update to version 2.31.91:
+ bgo#628056: Don't try to activate configurations without any
'on' outputs
+ Updated translations.
-------------------------------------------------------------------
Tue Aug 31 09:58:06 UTC 2010 - aj@suse.de
- Change lang package Requires to Recommends since the data there
is not mandatory at runtime.
-------------------------------------------------------------------
Fri Aug 6 11:31:50 CEST 2010 - vuntz@opensuse.org

32
gnome-settings-daemon.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-settings-daemon (Version 2.31.91)
# spec file for package gnome-settings-daemon (Version 2.31.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,15 +18,13 @@
Name: gnome-settings-daemon
Version: 2.31.91
Version: 2.31.6
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.
@ -41,26 +39,19 @@ Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
Patch13: gnome-settings-daemon-add-layout-switcher.patch
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-patch-translation
BuildRequires: intltool
BuildRequires: libcanberra-devel
BuildRequires: libgnomekbd-devel
BuildRequires: libnotify-devel
BuildRequires: libpulse-devel
BuildRequires: mozilla-nss-devel
BuildRequires: polkit-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-desktop-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libcanberra-gtk)
BuildRequires: pkgconfig(libgnomekbd)
BuildRequires: pkgconfig(libgnomekbdui)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(xi)
Recommends: %{name}-lang = %{version}
BuildRequires: xorg-x11
Requires: %{name}-lang = %{version}
# Split so people can depend on this only if needed
Requires: %{name}-polkit-datetime = %{version}
Obsoletes: resapplet
@ -112,7 +103,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