From 7422b37bd7f7cdc04f2e618304b685a01d9ac888d8ca8ca835e1f456eda51129 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Sep 2020 09:02:54 +0000 Subject: [PATCH] Accepting request 835311 from home:oertel:branches:GNOME:Factory - fix build on s390x (wacom=false but wayland=true) OBS-URL: https://build.opensuse.org/request/show/835311 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=370 --- gnome-settings-daemon.changes | 5 +++++ gnome-settings-daemon.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index cdde6a1..f3fbbcb 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 18 01:31:34 CEST 2020 - ro@suse.de + +- fix build on s390x (wacom=false but wayland=true) + ------------------------------------------------------------------- Thu Apr 30 05:28:07 UTC 2020 - Bjørn Lie diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index ddbd40e..b2d5ea4 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -271,11 +271,13 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop -%dir %{_sysconfdir}/xdg/Xwayland-session.d -%{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb %{_userunitdir}/gsd-wacom.service %{_userunitdir}/gsd-wacom.target %endif +%if %{with wayland} +%dir %{_sysconfdir}/xdg/Xwayland-session.d +%{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb +%endif %{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules %{_userunitdir}/gnome-session-initialized.target.wants/ %dir %{_userunitdir}/gnome-session-x11-services.target.wants/