Hello community,
here is the log from the commit of package gnome-shell-extensions for
openSUSE:Factory checked in at 2020-05-16 22:26:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old)
and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell-extensions"
Sat May 16 22:26:01 2020 rev:99 rq:805781 version:3.36.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes
2020-05-02 22:15:26.208297150 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.2738/gnome-shell-extensions.changes
2020-05-16 22:26:09.997252471 +0200
@@ -1,0 +2,7 @@
+Tue May 12 07:16:00 UTC 2020 - Xiaoguang Wang <xiaoguang.w...@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).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-shell-extensions.spec ++++++
--- /var/tmp/diff_new_pack.DpGvco/_old 2020-05-16 22:26:11.297255140 +0200
+++ /var/tmp/diff_new_pack.DpGvco/_new 2020-05-16 22:26:11.301255148 +0200
@@ -34,10 +34,10 @@
Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override
# PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580
dli...@suse.com -- allow adding app shortcut to desktop easily.
Patch1: gnome-shell-add-app-to-desktop.patch
-# PATCH-FIX-OPENSUSE gnome-classic-s390-not-require-g-s-d_wacom.patch
bsc#1129412 yfji...@suse.com -- Remove the runtime requirement of g-s-d Wacom
plugin
-Patch2: gnome-classic-s390-not-require-g-s-d_wacom.patch
# PATCH-FIX-UPSTREAM gnome-session-remove-gsd-XSettings.patch bsc#1163262
glgo#GNOME/gnome-session#51 xw...@suse.com -- remove
org.gnome.SettingsDaemon.XSettings from gnome-classic.session
-Patch3: gnome-shell-extensions-remove-gsd-XSettings.patch
+Patch2: gnome-shell-extensions-remove-gsd-XSettings.patch
+# PATCH-FIX-OPENSUSE gnome-classic-s390-not-require-g-s-d_wacom.patch
bsc#1129412 yfji...@suse.com -- Remove the runtime requirement of g-s-d Wacom
plugin
+Patch3: gnome-classic-s390-not-require-g-s-d_wacom.patch
## NOTE keep SLE Classic patch at the bottom
# PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxi...@suse.com -- add
sle classic support
@@ -117,10 +117,10 @@
%prep
%setup -q
%patch1 -p1
-%ifarch s390 s390x
%patch2 -p1
-%endif
+%ifarch s390 s390x
%patch3 -p1
+%endif
translation-update-upstream po %{name}
gnome-patch-translation-prepare po %{name}
++++++ gnome-classic-s390-not-require-g-s-d_wacom.patch ++++++
--- /var/tmp/diff_new_pack.DpGvco/_old 2020-05-16 22:26:11.353255255 +0200
+++ /var/tmp/diff_new_pack.DpGvco/_new 2020-05-16 22:26:11.353255255 +0200
@@ -1,9 +1,9 @@
-Index: gnome-shell-extensions-3.34.1/data/gnome-classic.session.desktop.in
+Index: gnome-shell-extensions-3.34.2/data/gnome-classic.session.desktop.in
===================================================================
---- gnome-shell-extensions-3.34.1.orig/data/gnome-classic.session.desktop.in
2019-12-02 10:17:20.012181181 +0100
-+++ gnome-shell-extensions-3.34.1/data/gnome-classic.session.desktop.in
2019-12-02 10:17:37.176181929 +0100
+--- gnome-shell-extensions-3.34.2.orig/data/gnome-classic.session.desktop.in
++++ gnome-shell-extensions-3.34.2/data/gnome-classic.session.desktop.in
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME Classic
--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;
