- Update to 2.21.91

- Remove obsolete patches
This commit is contained in:
Bastien Nocera 2008-02-11 18:03:03 +00:00
parent d82376b7fb
commit 8eadaec3c7
5 changed files with 8 additions and 28 deletions

View File

@ -1 +1 @@
gnome-settings-daemon-2.21.90.1.tar.bz2
gnome-settings-daemon-2.21.91.tar.bz2

View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.21.90.1
Release: 3%{?dist}
Version: 2.21.91
Release: 1%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -29,10 +29,6 @@ BuildRequires: libgnomekbd-devel
BuildRequires: gettext
BuildRequires: perl(XML::Parser)
Patch0: gsd-path-fix.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=511771
Patch1: load-xkb.patch
%description
A daemon to share settings from GNOME to other applications. It also
handles global keybindings, as well as a number of desktop-wide settings.
@ -50,8 +46,6 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .path
%patch1 -p1 -b .load-xkb
%build
%configure --enable-static=no
@ -117,6 +111,10 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Mon Feb 11 2008 - Bastien Nocera <bnocera@redhat.com> - 2.21.91-1
- Update to 2.21.91
- Remove obsolete patches
* Thu Feb 7 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90.1-3
- Load xkb settings initially

View File

@ -1,7 +0,0 @@
--- trunk/data/org.gnome.SettingsDaemon.service.in 2008/01/28 13:23:34 73
+++ trunk/data/org.gnome.SettingsDaemon.service.in 2008/01/29 18:10:26 81
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.gnome.SettingsDaemon
-Exec=@libexecdir@/gnome-settings-daemon/gnome-settings-daemon
+Exec=@libexecdir@/gnome-settings-daemon

View File

@ -1,11 +0,0 @@
diff -up gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c
--- gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb 2008-02-07 22:49:45.000000000 -0500
+++ gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c 2008-02-07 22:49:57.000000000 -0500
@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM
/* Essential - xkb initialization should happen before */
gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
gsd_keyboard_xkb_init (client);
+ gsd_keyboard_xkb_load (client);
register_config_callback (manager,
GSD_KEYBOARD_KEY,

View File

@ -1 +1 @@
aa768edfa15895d6d88586cdaf28e121 gnome-settings-daemon-2.21.90.1.tar.bz2
a411525584ec30d19e37f8b2be7bbe65 gnome-settings-daemon-2.21.91.tar.bz2