diff --git a/gnome-shell-executable-path-not-absolute.patch b/gnome-shell-executable-path-not-absolute.patch new file mode 100644 index 0000000..8be7820 --- /dev/null +++ b/gnome-shell-executable-path-not-absolute.patch @@ -0,0 +1,35 @@ +diff --git a/data/meson.build b/data/meson.build +index 4a1e16d..490e793 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -115,8 +115,14 @@ if have_systemd + install_dir: systemduserunitdir + ) + +- units = files('org.gnome.Shell.target', +- 'org.gnome.Shell-disable-extensions.service') ++ configure_file( ++ input: 'org.gnome.Shell-disable-extensions.service.in', ++ output: 'org.gnome.Shell-disable-extensions.service', ++ configuration: unitconf, ++ install_dir: systemduserunitdir ++ ) ++ ++ units = files('org.gnome.Shell.target') + + install_data(units, install_dir: systemduserunitdir) + endif +diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service.in +similarity index 85% +rename from data/org.gnome.Shell-disable-extensions.service +rename to data/org.gnome.Shell-disable-extensions.service.in +index de91167..49236a6 100644 +--- a/data/org.gnome.Shell-disable-extensions.service ++++ b/data/org.gnome.Shell-disable-extensions.service.in +@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions + [Service] + Type=simple + # Disable extensions +-ExecStart=gsettings set org.gnome.shell disable-user-extensions true ++ExecStart=@bindir@/gsettings set org.gnome.shell disable-user-extensions true + Restart=no diff --git a/gnome-shell.changes b/gnome-shell.changes index a651577..f9e738a 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 10 02:51:13 UTC 2021 - Xiaoguang Wang + +- Add gnome-shell-executable-path-not-absolute.patch: Fix ExecStart + is not absolute path. ExecStart can use related path in high + systemd version. The current systemd version in SLE-15-SP2 + should use absolute path (bsc#1176051 bsc#1188960). + ------------------------------------------------------------------- Mon Aug 2 00:09:07 UTC 2021 - Yifan Jiang diff --git a/gnome-shell.spec b/gnome-shell.spec index 753e8fb..e7c921e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -42,6 +42,8 @@ Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.pa Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch # PATCH-FIX-UPSTREAM gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch jsc#SLE-16051 glgo#GNOME/gnome-shell!1563 qzhao@suse.com -- launch recommended input engines when Gnome-shell init in CJK regions. Patch6: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch +# PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch bsc#1176051 xwang@suse.com -- Fix ExecStart is not absolute path +Patch7: gnome-shell-executable-path-not-absolute.patch ## NOTE: Keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname. @@ -180,6 +182,7 @@ This package contains an optional extensions app for managing GNOME Shell extens %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 %patch6 -p1 %endif +%patch7 -p1 translation-update-upstream