diff --git a/.cvsignore b/.cvsignore index a786ad3..5513d6f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-session-2.21.92.tar.bz2 +gnome-session-2.21.93.tar.bz2 diff --git a/gnome-session-enable-sound-by-default.patch b/gnome-session-enable-sound-by-default.patch deleted file mode 100644 index 9f7cdae..0000000 --- a/gnome-session-enable-sound-by-default.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: gnome-session/gsm-sound.c -=================================================================== ---- gnome-session/gsm-sound.c (revision 4457) -+++ gnome-session/gsm-sound.c (working copy) -@@ -12,27 +12,12 @@ - #include - #include - --#define ENABLE_SOUND_KEY "/desktop/gnome/sound/enable_esd" - #define ENABLE_EVENT_SOUNDS_KEY "/desktop/gnome/sound/event_sounds" - - static gboolean - sound_enabled (void) - { -- GConfClient *client; -- GError *error = NULL; -- gboolean retval; -- -- client = gsm_get_conf_client (); -- -- retval = gconf_client_get_bool (client, ENABLE_SOUND_KEY, &error); -- if (error) -- { -- g_warning ("Error getting value of " ENABLE_SOUND_KEY ": %s", error->message); -- g_error_free (error); -- return FALSE; /* Fallback value */ -- } -- -- return retval; -+ return TRUE; - } - - static gboolean diff --git a/gnome-session.spec b/gnome-session.spec index fb2e217..4c99a2e 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -11,7 +11,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.21.92 +Version: 2.21.93 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.21/%{name}-%{version}.tar.bz2 @@ -39,9 +39,6 @@ Conflicts: gdm < 1:2.6.0.8-5 Patch1: gnome-session-2.2.2-icons.patch -# Launch "esd" (really pulseaudio) all the time -Patch2: gnome-session-enable-sound-by-default.patch - # too much crashing Patch9: gnome-session-2.13.4-no-crashes.patch @@ -59,8 +56,6 @@ Patch20: gnome-session-2.19.4-atspi-timeout.patch # http://bugzilla.gnome.org/show_bug.cgi?id=475468 Patch22: ice-leaks.patch -BuildRequires: esound-devel >= %{esound_version} -BuildRequires: /usr/bin/esd BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -118,7 +113,7 @@ intltoolize --force autoheader autoconf -%configure --enable-esd --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot +%configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot make %{?_smp_mflags} %install @@ -188,6 +183,9 @@ fi %doc %{_mandir}/man*/* %changelog +* Thu Mar 06 2008 - Bastien Nocera - 2.21.93-1 +- Update to 2.21.93, drop esound dependencies and patches + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 diff --git a/sources b/sources index b47cbcc..257cb42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1d3f82efc633772bfe92a2ddca92168 gnome-session-2.21.92.tar.bz2 +d54c519c87f20130d9b52ffd631840c9 gnome-session-2.21.93.tar.bz2