OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=4

gnome-settings-daemon-default-config.patch

@@ -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 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
-             <locale name="C">
-                 <short>Eject</short>
-                 <long>Eject's shortcut.</long>

gnome-settings-daemon-default-keybindings.patch

@@ -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 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xa0</default>
-             <locale name="C">
-                 <short>Volume mute</short>
-                 <long>Volume mute's shortcut</long>
-@@ -29,7 +29,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_down</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/volume_down</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xae</default>
-             <locale name="C">
-                 <short>Volume down</short>
-                 <long>Volume down's shortcut.</long>
-@@ -41,7 +41,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_up</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/volume_up</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xb0</default>
-             <locale name="C">
-                 <short>Volume up</short>
-                 <long>Volume up's shortcut.</long>
-@@ -65,7 +65,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xcc</default>
-             <locale name="C">
-                 <short>Eject</short>
-                 <long>Eject's shortcut.</long>
-@@ -89,7 +89,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/search</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/search</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xe5</default>
-             <locale name="C">
-                 <short>Search</short>
-                 <long>Search's shortcut.</long>
-@@ -101,7 +101,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/email</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/email</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xec</default>
-             <locale name="C">
-                 <short>E-mail</short>
-                 <long>E-mail's shortcut.</long>
-@@ -137,7 +137,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/help</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/help</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xf5</default>
-             <locale name="C">
-                 <short>Launch help browser</short>
-                 <long>Launch help browser's shortcut.</long>
-@@ -149,7 +149,7 @@
-             <key>/schemas/apps/gnome_settings_daemon/keybindings/www</key>
-             <applyto>/apps/gnome_settings_daemon/keybindings/www</applyto>
-             <type>string</type>
--            <default></default>
-+            <default>0xb2</default>
-             <locale name="C">
-                 <short>Launch web browser</short>
-                 <long>Launch web browser's shortcut.</long>

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
 

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