rpm/gnome-shell-extensions
SHA256
1
0
Fork 0
forked from pool/gnome-shell-extensions
Code Pull Requests Activity

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

Browse Source 
- 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/804189
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=219
This commit is contained in:
Dominique Leuenberger 2020-05-15 09:34:27 +00:00 committed by Git OBS Bridge
parent 0edb240021
commit 8d6ef69c2b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnome-classic-s390-not-require-g-s-d_wacom.patch
View File

@ -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.2.orig/data/gnome-classic.session.desktop.in
+++ 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/data/gnome-classic.session.desktop.in
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
[GNOME Session] [GNOME Session]
Name=GNOME Classic 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.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;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;

7
gnome-shell-extensions.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 12 07:16:00 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).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 30 05:26:25 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com> Thu Apr 30 05:26:25 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

10
gnome-shell-extensions.spec
View File

@ -34,10 +34,10 @@ Source6: sle-classic@suse.com.tar.gz
Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override
# PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily. # PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily.
Patch1: gnome-shell-add-app-to-desktop.patch Patch1: gnome-shell-add-app-to-desktop.patch
# PATCH-FIX-OPENSUSE gnome-classic-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@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 xwang@suse.com -- remove org.gnome.SettingsDaemon.XSettings from gnome-classic.session # PATCH-FIX-UPSTREAM gnome-session-remove-gsd-XSettings.patch bsc#1163262 glgo#GNOME/gnome-session#51 xwang@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 yfjiang@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 ## NOTE keep SLE Classic patch at the bottom
# PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support # PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support
@ -117,10 +117,10 @@ to pick system installed themes or even themes installed in the user's home.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%ifarch s390 s390x
%patch2 -p1 %patch2 -p1
%endif %ifarch s390 s390x
%patch3 -p1 %patch3 -p1
%endif
translation-update-upstream po %{name} translation-update-upstream po %{name}
gnome-patch-translation-prepare po %{name} gnome-patch-translation-prepare po %{name}