diff --git a/gnome-settings-daemon-2.27.90.tar.bz2 b/gnome-settings-daemon-2.27.90.tar.bz2 deleted file mode 100644 index f71cb13..0000000 --- a/gnome-settings-daemon-2.27.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7e353ee86123bae381cbe3639b3fc018ea4d6d729520636fafce382ad633e4e -size 1169026 diff --git a/gnome-settings-daemon-2.27.91.tar.bz2 b/gnome-settings-daemon-2.27.91.tar.bz2 new file mode 100644 index 0000000..2b36905 --- /dev/null +++ b/gnome-settings-daemon-2.27.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3110061c42980f4798990ac2df01c53409fd0b562b255c522f3ab4992e0b356b +size 1171227 diff --git a/gnome-settings-daemon-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch index 60c1ae0..c3657a5 100644 --- a/gnome-settings-daemon-bnc462640-mute-action.patch +++ b/gnome-settings-daemon-bnc462640-mute-action.patch @@ -1,7 +1,7 @@ -Index: gnome-settings-daemon-2.25.90/data/apps_gnome_settings_daemon_keybindings.schemas.in +Index: gnome-settings-daemon-2.27.91/data/apps_gnome_settings_daemon_keybindings.schemas.in =================================================================== ---- gnome-settings-daemon-2.25.90.orig/data/apps_gnome_settings_daemon_keybindings.schemas.in -+++ gnome-settings-daemon-2.25.90/data/apps_gnome_settings_daemon_keybindings.schemas.in +--- gnome-settings-daemon-2.27.91.orig/data/apps_gnome_settings_daemon_keybindings.schemas.in ++++ gnome-settings-daemon-2.27.91/data/apps_gnome_settings_daemon_keybindings.schemas.in @@ -14,6 +14,17 @@ @@ -20,11 +20,11 @@ Index: gnome-settings-daemon-2.25.90/data/apps_gnome_settings_daemon_keybindings /schemas/apps/gnome_settings_daemon/keybindings/volume_mute /apps/gnome_settings_daemon/keybindings/volume_mute string -Index: gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c +Index: gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c =================================================================== ---- gnome-settings-daemon-2.25.90.orig/plugins/media-keys/gsd-media-keys-manager.c -+++ gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c -@@ -656,8 +656,10 @@ do_sound_action (GsdMediaKeysManager *ma +--- gnome-settings-daemon-2.27.91.orig/plugins/media-keys/gsd-media-keys-manager.c ++++ gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c +@@ -632,8 +632,10 @@ do_sound_action (GsdMediaKeysManager *ma int type) { gboolean muted; @@ -35,10 +35,12 @@ Index: gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c if (manager->priv->stream == NULL) return; -@@ -680,8 +682,23 @@ do_sound_action (GsdMediaKeysManager *ma - +@@ -654,7 +656,23 @@ do_sound_action (GsdMediaKeysManager *ma switch (type) { case MUTE_KEY: + muted = !muted; +- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); ++ + error = NULL; + toggle_mute = gconf_client_get_bool (manager->priv->conf_client, + GCONF_MISC_DIR "/toggle_mute", @@ -49,11 +51,9 @@ Index: gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c + g_error_free (error); + } + - manager->priv->num_expected_update_signals = 1; -- gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted); + if (toggle_mute) + gvc_mixer_stream_change_is_muted (manager->priv->stream, -+ !muted); ++ muted); + else + gvc_mixer_stream_change_is_muted (manager->priv->stream, + TRUE); diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 7de0956..a219006 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 25 14:05:49 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.91: + + Update gnome-volume-control code + + Update cut'n'paste from gnome-media + + Update volume control code for new API + + Updated translations. + ------------------------------------------------------------------- Fri Aug 14 16:24:02 CEST 2009 - vuntz@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 7dc0bcd..b1e914d 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.27.90) +# spec file for package gnome-settings-daemon (Version 2.27.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,26 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: gnome-settings-daemon %define _name gnome-settings-daemon -BuildRequires: fdupes -BuildRequires: gnome-common -BuildRequires: gnome-desktop-devel -BuildRequires: gnome-patch-translation -BuildRequires: intltool -BuildRequires: libgnomekbd-devel -BuildRequires: libnotify-devel -BuildRequires: libpulse-devel -BuildRequires: update-desktop-files -BuildRequires: xorg-x11 -License: GPL v2 or later -Group: System/GUI/GNOME -Version: 2.27.90 +Version: 2.27.91 Release: 1 +License: GPL v2 or later Summary: Settings daemon for the GNOME desktop +Url: http://www.gnome.org +Group: System/GUI/GNOME Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff @@ -50,7 +40,16 @@ Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff Patch12: gnome-settings-daemon-activate-xkb-with-broken.patch # PATCH-FIX-UPSTREAM # gnome-settings-daemon-try-harder-gdm-layout.patch bgo585290 vuntz@novell.com -- Try harder to use the keyboard layout passed from GDM Patch13: gnome-settings-daemon-try-harder-gdm-layout.patch -Url: http://www.gnome.org +BuildRequires: fdupes +BuildRequires: gnome-common +BuildRequires: gnome-desktop-devel +BuildRequires: gnome-patch-translation +BuildRequires: intltool +BuildRequires: libgnomekbd-devel +BuildRequires: libnotify-devel +BuildRequires: libpulse-devel +BuildRequires: update-desktop-files +BuildRequires: xorg-x11 Requires: %{name}-lang = %{version} Obsoletes: resapplet BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,21 +64,17 @@ the startup of the screensaver, etc. This module was previously part of GNOME Control Center, but has been splitted from it for a more general use. - - -Authors: --------- - Jonathan Blandford - William Jon McCann - Rodrigo Moya - Denis Washington - %package devel License: GPL v2 or later Summary: Development package for the GNOME settings daemon Group: System/GUI/GNOME -AutoReqProv: on -Requires: %{name} = %{version} dbus-1-devel dbus-1-glib-devel glib2-devel gtk2-devel gnome-desktop-devel gnome-menus-devel +Requires: %{name} = %{version} +Requires: dbus-1-devel +Requires: dbus-1-glib-devel +Requires: glib2-devel +Requires: gnome-desktop-devel +Requires: gnome-menus-devel +Requires: gtk2-devel %description devel gnome-settings-daemon provides a daemon run by all GNOME sessions to @@ -90,15 +85,6 @@ the startup of the screensaver, etc. This package includes header files used for client applications to contact the settings daemon via its DBus interface. - - -Authors: --------- - Jonathan Blandford - William Jon McCann - Rodrigo Moya - Denis Washington - %lang_package %prep %setup -q -n %{_name}-%{version} @@ -124,15 +110,15 @@ make %{?jobs:-j%jobs} %install %makeinstall -rm $RPM_BUILD_ROOT/%{_libdir}/gnome-settings-daemon-2.0/*.*a +rm %{buildroot}%{_libdir}/gnome-settings-daemon-2.0/*.*a %suse_update_desktop_file gnome-settings-daemon %find_lang %{_name} %find_gconf_schemas cat %{name}.schemas_list >gnome-%{name}.lst -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig