Hello community, here is the log from the commit of package metacity checked in at Fri Sep 14 00:45:46 CEST 2007. -------- --- GNOME/metacity/metacity.changes 2007-08-30 02:49:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2007-09-13 20:25:01.603095000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 13 20:08:58 CEST 2007 - maw@suse.de + +- Add metacity-disable-window-keys.patch, which disables the + default binding of the "windows key" on openSUSE (#217044); note + that future releases of SLES will be unimpacted by this change. + +------------------------------------------------------------------- New: ---- metacity-disable-window-keys.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.P17146/_old 2007-09-14 00:45:28.000000000 +0200 +++ /var/tmp/diff_new_pack.P17146/_new 2007-09-14 00:45:28.000000000 +0200 @@ -15,14 +15,21 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.55 -Release: 1 +Release: 7 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Patch: metacity-ping-timeout.patch Patch2: metacity-preconf.dif Patch8: metacity-audible-bell-off.patch +# Rather than maintain two versions of the same patch, it seems easier +# to apply the second one on after the first. In SLES, we enable the +# "windows key" by default in metacity-windows-key-binding.patch. In +# openSUSE, that default is unpopular, so we turn it off in +# metacity-disable-window-keys.patch. Moving forward, care needs to be +# taken to keep the second patch consistent with the first. Patch9: metacity-windows-key-binding.patch -URL: http://www.gnome.org +Patch10: metacity-disable-window-keys.patch +Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build # Only for /usr/share/gnome directory ownership: BuildRequires: libgnome @@ -31,8 +38,7 @@ # Requires: libgnome control-center2 Requires: libgnome Requires: %{name}-lang = %{version} -Autoreqprov: on - +AutoReqProv: on %gconf_schemas_prereq %description @@ -61,6 +67,10 @@ %patch2 -p1 %patch8 %patch9 +# We stick with our default behavior on SLES but not on openSUSE. +%if ! %sles_version +%patch10 -p1 +%endif gnome-patch-translation-update %build @@ -78,7 +88,6 @@ %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst - %fdupes $RPM_BUILD_ROOT %clean @@ -88,7 +97,6 @@ %post %run_ldconfig - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -122,6 +130,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Sep 13 2007 - maw@suse.de +- Add metacity-disable-window-keys.patch, which disables the + default binding of the "windows key" on openSUSE (#217044); note + that future releases of SLES will be unimpacted by this change. * Thu Aug 30 2007 - jpr@suse.de - Update to 2.19.55 - Noninteger auto-raise delay is not assumed to be zero (BGO #377491) ++++++ metacity-disable-window-keys.patch ++++++ Index: metacity-2.19.55/src/metacity.schemas.in =================================================================== --- metacity-2.19.55.orig/src/metacity.schemas.in +++ metacity-2.19.55/src/metacity.schemas.in @@ -392,7 +392,7 @@ <applyto>/apps/metacity/general/enable_windows_keys</applyto> <owner>metacity</owner> <type>bool</type> - <default>true</default> + <default>false</default> <locale name="C"> <short>If true, enables the Windows flag keys to show the panel's main menu</short> <long> Index: metacity-2.19.55/src/prefs.c =================================================================== --- metacity-2.19.55.orig/src/prefs.c +++ metacity-2.19.55/src/prefs.c @@ -105,7 +105,7 @@ static gboolean provide_visual_bell = FA static gboolean bell_is_audible = TRUE; static gboolean reduced_resources = FALSE; static gboolean gnome_accessibility = FALSE; -static gboolean enable_windows_keys = TRUE; +static gboolean enable_windows_keys = FALSE; static char *cursor_theme = NULL; static int cursor_size = 24; static gboolean compositing_manager = FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org