diff --git a/.cvsignore b/.cvsignore index 1dd24d9..6a7269d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-settings-daemon-2.21.90.1.tar.bz2 +gnome-settings-daemon-2.21.91.tar.bz2 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index ad8518f..0ef7205 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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 - 2.21.91-1 +- Update to 2.21.91 +- Remove obsolete patches + * Thu Feb 7 2008 Matthias Clasen - 2.21.90.1-3 - Load xkb settings initially diff --git a/gsd-path-fix.patch b/gsd-path-fix.patch deleted file mode 100644 index 87929c5..0000000 --- a/gsd-path-fix.patch +++ /dev/null @@ -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 diff --git a/load-xkb.patch b/load-xkb.patch deleted file mode 100644 index 90698fd..0000000 --- a/load-xkb.patch +++ /dev/null @@ -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, diff --git a/sources b/sources index de9b5ba..ff0bd63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa768edfa15895d6d88586cdaf28e121 gnome-settings-daemon-2.21.90.1.tar.bz2 +a411525584ec30d19e37f8b2be7bbe65 gnome-settings-daemon-2.21.91.tar.bz2