From 65076ac83c1e9a231f5eb75329d86ac197dbae3169358dd5e62478a766ecf51f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 31 Aug 2010 12:17:06 +0000 Subject: [PATCH 1/6] Accepting request 46788 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/gnome-settings-daemon via accept of submit request 46788 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/46788 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=67 --- gnome-settings-daemon.changes | 5 +++++ gnome-settings-daemon.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 3c42b26..0bdce06 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 31 09:58:06 UTC 2010 - aj@suse.de + +- Recommend instead of require lang package since it's not mandatory. + ------------------------------------------------------------------- Fri Aug 6 11:31:50 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 57e786c..fb8027f 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -51,7 +51,7 @@ BuildRequires: polkit-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: xorg-x11 -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} # Split so people can depend on this only if needed Requires: %{name}-polkit-datetime = %{version} Obsoletes: resapplet From f617ea214bf1823246b059fe9c127bb1795cf20a5fc4aff6f26c74d92bd57854 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 31 Aug 2010 17:17:34 +0000 Subject: [PATCH 2/6] Accepting request 46836 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 46836 revision 3. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/46836 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=68 --- gnome-settings-daemon-2.31.6.tar.bz2 | 3 --- gnome-settings-daemon-2.31.91.tar.bz2 | 3 +++ gnome-settings-daemon.changes | 11 ++++++++++- gnome-settings-daemon.spec | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 gnome-settings-daemon-2.31.6.tar.bz2 create mode 100644 gnome-settings-daemon-2.31.91.tar.bz2 diff --git a/gnome-settings-daemon-2.31.6.tar.bz2 b/gnome-settings-daemon-2.31.6.tar.bz2 deleted file mode 100644 index c67b0ea..0000000 --- a/gnome-settings-daemon-2.31.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b4a06d636c02774925da61076c60a9fcc22876b07b7479056379ce9c72a3055 -size 1306168 diff --git a/gnome-settings-daemon-2.31.91.tar.bz2 b/gnome-settings-daemon-2.31.91.tar.bz2 new file mode 100644 index 0000000..9159003 --- /dev/null +++ b/gnome-settings-daemon-2.31.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7eaefa67c17d8cd9a6f42e9099501253a1e079119fa8c0ed16bffd0aa37065f +size 1314162 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 0bdce06..0bdc94d 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,7 +1,16 @@ +------------------------------------------------------------------- +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 -- Recommend instead of require lang package since it's not mandatory. +- 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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index fb8027f..f6590d9 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.31.6) +# spec file for package gnome-settings-daemon (Version 2.31.91) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-settings-daemon -Version: 2.31.6 +Version: 2.31.91 Release: 1 License: GPLv2+ Summary: Settings daemon for the GNOME desktop From 79d18530a158befce66bbe247fdba3da9bd9c51fce208b4043a46f54e8a98618 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 4 Sep 2010 20:54:07 +0000 Subject: [PATCH 3/6] 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 --- gnome-settings-daemon-display-tool.patch | 22 ++++++++++++++++++++++ gnome-settings-daemon.changes | 7 +++++++ gnome-settings-daemon.spec | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 gnome-settings-daemon-display-tool.patch diff --git a/gnome-settings-daemon-display-tool.patch b/gnome-settings-daemon-display-tool.patch new file mode 100644 index 0000000..3ff87a3 --- /dev/null +++ b/gnome-settings-daemon-display-tool.patch @@ -0,0 +1,22 @@ +commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee +Author: Matthias Clasen +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" diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 0bdc94d..0654ed1 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f6590d9..aaf1cb2 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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 From adaaa00fe9b85da5e985883823a7130861e5e85770a6642b3e651b7919ced87f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Sep 2010 12:29:16 +0000 Subject: [PATCH 4/6] Accepting request 47432 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/47432 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=70 --- gnome-settings-daemon.changes | 14 ++++++++++++++ gnome-settings-daemon.spec | 23 +++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 0654ed1..5bd0e70 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index aaf1cb2..ee03237 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -41,18 +41,25 @@ 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: xorg-x11 +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} # Split so people can depend on this only if needed Requires: %{name}-polkit-datetime = %{version} From 7cb7a89863d3dbf8be3373ccfdc8bc4c74ab360057ffe4672fb52914ac367b50 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 10:18:44 +0000 Subject: [PATCH 5/6] Accepting request 47759 from GNOME:Factory 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 --- gnome-settings-daemon-2.31.6.tar.bz2 | 3 ++ gnome-settings-daemon-2.31.91.tar.bz2 | 3 -- gnome-settings-daemon-display-tool.patch | 22 --------------- gnome-settings-daemon.changes | 35 ------------------------ gnome-settings-daemon.spec | 32 ++++++++-------------- 5 files changed, 14 insertions(+), 81 deletions(-) create mode 100644 gnome-settings-daemon-2.31.6.tar.bz2 delete mode 100644 gnome-settings-daemon-2.31.91.tar.bz2 delete mode 100644 gnome-settings-daemon-display-tool.patch diff --git a/gnome-settings-daemon-2.31.6.tar.bz2 b/gnome-settings-daemon-2.31.6.tar.bz2 new file mode 100644 index 0000000..c67b0ea --- /dev/null +++ b/gnome-settings-daemon-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b4a06d636c02774925da61076c60a9fcc22876b07b7479056379ce9c72a3055 +size 1306168 diff --git a/gnome-settings-daemon-2.31.91.tar.bz2 b/gnome-settings-daemon-2.31.91.tar.bz2 deleted file mode 100644 index 9159003..0000000 --- a/gnome-settings-daemon-2.31.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7eaefa67c17d8cd9a6f42e9099501253a1e079119fa8c0ed16bffd0aa37065f -size 1314162 diff --git a/gnome-settings-daemon-display-tool.patch b/gnome-settings-daemon-display-tool.patch deleted file mode 100644 index 3ff87a3..0000000 --- a/gnome-settings-daemon-display-tool.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee -Author: Matthias Clasen -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" diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 5bd0e70..3c42b26 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index ee03237..57e786c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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 From e9040ee8c2971521aae4d4e88e41c4e01c2731f344d770ed4f3c44ac6d6ccbd2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 13 Sep 2010 10:18:45 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/gnome-settings-daemon revision 54.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=b76fa02cced0d66a00acf5b9f2743404 --- gnome-settings-daemon-2.31.6.tar.bz2 | 3 -- gnome-settings-daemon-2.31.91.tar.bz2 | 3 ++ gnome-settings-daemon-display-tool.patch | 22 +++++++++++++++ gnome-settings-daemon.changes | 35 ++++++++++++++++++++++++ gnome-settings-daemon.spec | 32 ++++++++++++++-------- 5 files changed, 81 insertions(+), 14 deletions(-) delete mode 100644 gnome-settings-daemon-2.31.6.tar.bz2 create mode 100644 gnome-settings-daemon-2.31.91.tar.bz2 create mode 100644 gnome-settings-daemon-display-tool.patch diff --git a/gnome-settings-daemon-2.31.6.tar.bz2 b/gnome-settings-daemon-2.31.6.tar.bz2 deleted file mode 100644 index c67b0ea..0000000 --- a/gnome-settings-daemon-2.31.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b4a06d636c02774925da61076c60a9fcc22876b07b7479056379ce9c72a3055 -size 1306168 diff --git a/gnome-settings-daemon-2.31.91.tar.bz2 b/gnome-settings-daemon-2.31.91.tar.bz2 new file mode 100644 index 0000000..9159003 --- /dev/null +++ b/gnome-settings-daemon-2.31.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7eaefa67c17d8cd9a6f42e9099501253a1e079119fa8c0ed16bffd0aa37065f +size 1314162 diff --git a/gnome-settings-daemon-display-tool.patch b/gnome-settings-daemon-display-tool.patch new file mode 100644 index 0000000..3ff87a3 --- /dev/null +++ b/gnome-settings-daemon-display-tool.patch @@ -0,0 +1,22 @@ +commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee +Author: Matthias Clasen +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" diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 3c42b26..5bd0e70 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 57e786c..ee03237 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.31.6) +# spec file for package gnome-settings-daemon (Version 2.31.91) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,15 @@ Name: gnome-settings-daemon -Version: 2.31.6 +Version: 2.31.91 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. @@ -39,19 +41,26 @@ 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: xorg-x11 -Requires: %{name}-lang = %{version} +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} # Split so people can depend on this only if needed Requires: %{name}-polkit-datetime = %{version} Obsoletes: resapplet @@ -103,6 +112,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