From e2d4a9b5010770d111bcb4a955efb3e9acc44edf8a96c9462fec4612d9069575 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 13 Mar 2008 18:01:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=4 --- gnome-settings-daemon-default-config.patch | 13 ---- ...-settings-daemon-default-keybindings.patch | 74 ------------------- gnome-settings-daemon.changes | 5 ++ gnome-settings-daemon.spec | 10 +-- 4 files changed, 8 insertions(+), 94 deletions(-) delete mode 100644 gnome-settings-daemon-default-config.patch delete mode 100644 gnome-settings-daemon-default-keybindings.patch diff --git a/gnome-settings-daemon-default-config.patch b/gnome-settings-daemon-default-config.patch deleted file mode 100644 index 26a38e1..0000000 --- a/gnome-settings-daemon-default-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: data/apps_gnome_settings_daemon_keybindings.schemas.in -=================================================================== ---- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig -+++ data/apps_gnome_settings_daemon_keybindings.schemas.in -@@ -65,7 +65,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/eject - /apps/gnome_settings_daemon/keybindings/eject - string -- -+ <Control><Alt>Delete - - Eject - Eject's shortcut. diff --git a/gnome-settings-daemon-default-keybindings.patch b/gnome-settings-daemon-default-keybindings.patch deleted file mode 100644 index 4f972b1..0000000 --- a/gnome-settings-daemon-default-keybindings.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- data/apps_gnome_settings_daemon_keybindings.schemas.in 2007-01-18 13:19:21.000000000 +0100 -+++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2007-01-18 13:22:56.000000000 +0100 -@@ -17,7 +17,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/volume_mute - /apps/gnome_settings_daemon/keybindings/volume_mute - string -- -+ 0xa0 - - Volume mute - Volume mute's shortcut -@@ -29,7 +29,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/volume_down - /apps/gnome_settings_daemon/keybindings/volume_down - string -- -+ 0xae - - Volume down - Volume down's shortcut. -@@ -41,7 +41,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/volume_up - /apps/gnome_settings_daemon/keybindings/volume_up - string -- -+ 0xb0 - - Volume up - Volume up's shortcut. -@@ -65,7 +65,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/eject - /apps/gnome_settings_daemon/keybindings/eject - string -- -+ 0xcc - - Eject - Eject's shortcut. -@@ -89,7 +89,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/search - /apps/gnome_settings_daemon/keybindings/search - string -- -+ 0xe5 - - Search - Search's shortcut. -@@ -101,7 +101,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/email - /apps/gnome_settings_daemon/keybindings/email - string -- -+ 0xec - - E-mail - E-mail's shortcut. -@@ -137,7 +137,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/help - /apps/gnome_settings_daemon/keybindings/help - string -- -+ 0xf5 - - Launch help browser - Launch help browser's shortcut. -@@ -149,7 +149,7 @@ - /schemas/apps/gnome_settings_daemon/keybindings/www - /apps/gnome_settings_daemon/keybindings/www - string -- -+ 0xb2 - - Launch web browser - Launch web browser's shortcut. diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index c85178b..07e5d15 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 13 16:58:01 CET 2008 - sbrabec@suse.cz + +- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. + ------------------------------------------------------------------- Tue Feb 19 23:28:50 CET 2008 - maw@suse.de diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index b2563f3..efe8d04 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -17,15 +17,11 @@ BuildRequires: fdupes gnome-common gnome-desktop-devel gnome-patch-translation License: GPL v2 or later Group: System/GUI/GNOME Version: 2.21.91 -Release: 1 +Release: 11 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE gnome-settings-daemon-default-config.patch -Patch1: %{name}-default-config.patch # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.patch Patch2: %{name}-system-proxy-configuration.patch -# PATCH-NEEDS-REBASE gnome-settings-daemon-default-keybindings.patch -Patch3: %{name}-default-keybindings.patch Url: http://www.gnome.org Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,9 +74,7 @@ Authors: %prep %setup -q -n %{_name}-%{version} #gnome-patch-translation-prepare -%patch1 #%patch2 -#%patch3 #gnome-patch-translation-update %build @@ -132,6 +126,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 13 2008 sbrabec@suse.cz +- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. * Wed Feb 20 2008 maw@suse.de - Update to version 2.21.91: + Use a flat directory instead of a hierarchy to install plugins