From 88397a829844ba47ec764d01f62fbb34e6eb473c8b6fb5b53101c40103ddf0d2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 26 May 2017 22:20:08 +0000 Subject: [PATCH 1/2] Accepting request 497992 from openSUSE:Factory:zSystems remove unpackaged desktop file if wacom not available OBS-URL: https://build.opensuse.org/request/show/497992 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=283 --- gnome-settings-daemon.changes | 5 +++++ gnome-settings-daemon.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index b50612f..0c5a21d 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 24 08:58:55 UTC 2017 - gunreben@t-online.de + +- delete /etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop for s390x + ------------------------------------------------------------------- Wed May 10 13:03:53 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index dfc893c..23435cb 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -185,6 +185,9 @@ make %{?jobs:-j%jobs} %install %makeinstall +%if %{without wacom} +rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop +%endif find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %find_lang %{name} %{?no_lang_C} From af4d8c0be5b5878b2342c9df12aacb839fc74dd5e05379d8b6e76df13c76ed4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 26 May 2017 22:39:23 +0000 Subject: [PATCH 2/2] Accepting request 498557 from home:Zaitor Resub with tweak OBS-URL: https://build.opensuse.org/request/show/498557 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=284 --- gnome-settings-daemon.changes | 9 ++++++++- gnome-settings-daemon.spec | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 0c5a21d..e42ae04 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Thu May 25 19:21:55 UTC 2017 - zaitor@opensuse.org + +- Apply gnome-settings-daemon-more-power-button-actions.patch for + SLE and Leap 42.x only (bgo#1040245). + ------------------------------------------------------------------- Wed May 24 08:58:55 UTC 2017 - gunreben@t-online.de -- delete /etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop for s390x +- Delete /etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop + for when no wacom support is present via conditional. ------------------------------------------------------------------- Wed May 10 13:03:53 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 23435cb..5634739 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -162,8 +162,8 @@ gnome-patch-translation-prepare %patch29 -p1 %if 0%{?suse_version} == 1315 %patch31 -p1 -%endif %patch32 -p1 +%endif %build %if 0%{?suse_version} == 1315