diff --git a/gnome-settings-daemon-sle-configure-timeout-blank.patch b/gnome-settings-daemon-sle-configure-timeout-blank.patch deleted file mode 100644 index 3078d47..0000000 --- a/gnome-settings-daemon-sle-configure-timeout-blank.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h ---- gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h 2019-08-05 18:40:19.000000000 -0500 -+++ gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h 2019-08-31 19:43:57.783501103 -0500 -@@ -18,7 +18,7 @@ - */ - - /* The blank delay when the screensaver is active */ --#define SCREENSAVER_TIMEOUT_BLANK 30 /* seconds */ -+#define SCREENSAVER_TIMEOUT_BLANK 300 /* seconds */ - - /* The dim delay when dimming on idle is requested but idle-delay - * is set to "Never" */ diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index f021219..d9a773e 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 13 07:39:37 UTC 2020 - QK ZHU + +- Drop gnome-settings-daemon-sle-configure-timeout-blank.patch: + Drop this for SLE and Leap to align with upstream(bsc#1158476). + ------------------------------------------------------------------- Wed Dec 18 10:31:47 UTC 2019 - bjorn.lie@gmail.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 545a5d5..82334b2 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-settings-daemon # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,8 +46,6 @@ Patch3: gnome-settings-daemon-bgo793253.patch Patch4: gnome-settings-daemon-notify-idle-resumed.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES Patch5: gnome-settings-daemon-bnc873545-hide-warnings.patch -# PATCH-FIX-OPENSUSE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min -Patch6: gnome-settings-daemon-sle-configure-timeout-blank.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. Patch7: gnome-settings-daemon-more-power-button-actions.patch @@ -152,11 +150,10 @@ gnome-patch-translation-prepare po %{name} %patch1 -p1 %patch2 -p1 %patch3 -p1 -# Enable the patches by now for both Leap 15 and SLE 15, meanwhile we should justify the patches upstream. +# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476. %if 0%{?sle_version} >= 150000 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %endif