Accepting request 804188 from home:xiaoguang_wang:branches:GNOME:Factory

- Update gnome-classic-s390-not-require-g-s-d_wacom.patch: Solve
  conflict with gnome-shell-extensions-remove-gsd-XSettings.patch
  (bsc#1171485).

OBS-URL: https://build.opensuse.org/request/show/804188
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=322
This commit is contained in:
Dominique Leuenberger 2020-05-15 09:34:21 +00:00 committed by Git OBS Bridge
parent cd0c4ffdee
commit c31702d6c4
2 changed files with 11 additions and 4 deletions

View File

@ -1,9 +1,9 @@
Index: gnome-session-3.34.2/data/gnome.session.desktop.in.in
===================================================================
--- gnome-session-3.34.2.orig/data/gnome.session.desktop.in.in 2019-11-29 13:31:35.916694686 +0100
+++ gnome-session-3.34.2/data/gnome.session.desktop.in.in 2019-11-29 13:34:30.620702300 +0100
--- gnome-session-3.34.2.orig/data/gnome.session.desktop.in.in
+++ gnome-session-3.34.2/data/gnome.session.desktop.in.in
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.XSettings;
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 12 07:18:56 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gnome-classic-s390-not-require-g-s-d_wacom.patch: Solve
conflict with gnome-shell-extensions-remove-gsd-XSettings.patch
(bsc#1171485).
-------------------------------------------------------------------
Wed Apr 15 01:20:42 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>