From 09feee1d50fdb771dcc2372adc163348f263abb05a7913c0a02a65ecc75b0b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 25 May 2020 17:42:48 +0000 Subject: [PATCH] Accepting request 808125 from home:AZhou:branches:GNOME:Factory - Add 00_org.gnome.desktop.peripherals.gschema.override: in SLE-15-SP2 and Leap 15.2, revert touchpad click method default value via gsettings vendor overrides, in order to be consistent with earlier service pack (bsc#1171593). OBS-URL: https://build.opensuse.org/request/show/808125 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gsettings-desktop-schemas?expand=0&rev=125 --- 00_org.gnome.desktop.peripherals.gschema.override | 2 ++ gsettings-desktop-schemas.changes | 8 ++++++++ gsettings-desktop-schemas.spec | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 00_org.gnome.desktop.peripherals.gschema.override diff --git a/00_org.gnome.desktop.peripherals.gschema.override b/00_org.gnome.desktop.peripherals.gschema.override new file mode 100644 index 0000000..66588ab --- /dev/null +++ b/00_org.gnome.desktop.peripherals.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.desktop.peripherals.touchpad] +click-method='default' diff --git a/gsettings-desktop-schemas.changes b/gsettings-desktop-schemas.changes index b3fffd2..3d36a50 100644 --- a/gsettings-desktop-schemas.changes +++ b/gsettings-desktop-schemas.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 22 08:15:42 UTC 2020 - Alynx Zhou + +- Add 00_org.gnome.desktop.peripherals.gschema.override: in + SLE-15-SP2 and Leap 15.2, revert touchpad click method default + value via gsettings vendor overrides, in order to be consistent + with earlier service pack (bsc#1171593). + ------------------------------------------------------------------- Thu Apr 30 05:31:29 UTC 2020 - Bjørn Lie diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index f0e0b7b..ef9d28c 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -25,6 +25,8 @@ License: LGPL-2.1-or-later Group: System/GUI/GNOME URL: https://gnome.org/ Source0: https://download.gnome.org/sources/gsettings-desktop-schemas/3.36/%{name}-%{version}.tar.xz +# SOURCE-FIX-SLE 00_org.gnome.desktop.peripherals.gschema.override bsc#1171593 alynx.zhou@suse.com -- Change touchpad click method to default +Source1: 00_org.gnome.desktop.peripherals.gschema.override # PATCH-FEATURE-OPENSUSE gsettings-desktop-schemas-fate324570-Add-key-for-GDM-background-configuration.patch fate#324570, glgo#GNOME/gnome-shell#680 qkzhu@suse.com -- This key is used by gnome-shell-fate324570-Make-GDM-background-image-configurable.patch Patch0: gsettings-desktop-schemas-fate324570-Add-key-for-GDM-background-configuration.patch @@ -59,6 +61,9 @@ This package contains development files. %prep %setup -q %patch0 -p1 +%if 0%{?sle_version} +cp -a %{SOURCE1} . +%endif translation-update-upstream po %{name} %build @@ -68,6 +73,9 @@ translation-update-upstream po %{name} %install %meson_install +%if 0%{?sle_version} +install -D -m0644 00_org.gnome.desktop.peripherals.gschema.override %{buildroot}%{_datadir}/glib-2.0/schemas/00_org.gnome.desktop.peripherals.gschema.override +%endif %find_lang %{name} %{?no_lang_C} %files @@ -103,6 +111,9 @@ translation-update-upstream po %{name} %{_datadir}/glib-2.0/schemas/org.gnome.system.location.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.system.proxy.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.peripherals.gschema.xml +%if 0%{?sle_version} +%{_datadir}/glib-2.0/schemas/00_org.gnome.desktop.peripherals.gschema.override +%endif %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert