diff --git a/gnome-session-s390-not-require-g-s-d_wacom.patch b/gnome-session-s390-not-require-g-s-d_wacom.patch new file mode 100644 index 0000000..082e01c --- /dev/null +++ b/gnome-session-s390-not-require-g-s-d_wacom.patch @@ -0,0 +1,12 @@ +Index: gnome-session-40.1.1/data/meson.build +=================================================================== +--- gnome-session-40.1.1.orig/data/meson.build ++++ gnome-session-40.1.1/data/meson.build +@@ -25,7 +25,6 @@ required_components = { + 'org.gnome.SettingsDaemon.Smartcard', + 'org.gnome.SettingsDaemon.Sound', + 'org.gnome.SettingsDaemon.UsbProtection', +- 'org.gnome.SettingsDaemon.Wacom', + 'org.gnome.SettingsDaemon.XSettings', + ], + } diff --git a/gnome-session.changes b/gnome-session.changes index 11773b2..152460c 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 15 03:14:36 UTC 2021 - Yifan Jiang + +- Add gnome-session-s390-not-require-g-s-d_wacom.patch: Remove the + gnome session runtime requirement of g-s-d Wacom plugin because + it is not build on s390 (bsc#1129412). + ------------------------------------------------------------------- Fri Jul 30 01:01:37 UTC 2021 - Xiaoguang Wang diff --git a/gnome-session.spec b/gnome-session.spec index fd0db03..116fb26 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -30,6 +30,8 @@ Source2: gnome.desktop Patch0: gnome-session-better-handle-empty-xdg_session_type.patch # PATCH-FIX-UPSTREAM gnome-session-exit-when-lost-name-on-bus.patch bsc#1175622 glgo!GNOME/gnome-session!60 xwang@suse.com -- gnome-session exit immediately when lost name on bus Patch1: gnome-session-exit-when-lost-name-on-bus.patch +# PATCH-FIX-OPENSUSE gnome-session-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-session-s390-not-require-g-s-d_wacom.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -103,7 +105,12 @@ functional GNOME desktop. %lang_package %prep -%autosetup -p1 +%setup -q +%patch0 -p1 +%patch1 -p1 +%ifarch s390 s390x +%patch2 -p1 +%endif translation-update-upstream po gnome-session-3.0 %build