Dominique Leuenberger 2019-12-07 21:16:22 +00:00 committed by Git OBS Bridge
parent b4cadf26ea
commit 62dbcb7cf5
2 changed files with 23 additions and 15 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Dec 5 02:12:43 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
- Enable the patches for both Leap and SLE (bsc#1158243):
+ gnome-settings-daemon-notify-idle-resumed.patch
+ gnome-settings-daemon-bnc873545-hide-warnings.patch
+ gnome-settings-daemon-sle-configure-timeout-blank.patch
+ gnome-settings-daemon-more-power-button-actions.patch
-------------------------------------------------------------------
Fri Nov 29 12:52:13 UTC 2019 - Frederic Crozat <fcrozat@suse.com>

View File

@ -42,16 +42,16 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch
Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
Patch3: gnome-settings-daemon-bgo793253.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
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
## SLE-only patches start at 1000
# PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch1000: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-SLE 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
Patch1001: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-SLE 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
Patch1002: gnome-settings-daemon-sle-configure-timeout-blank.patch
# PATCH-FIX-SLE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
Patch1003: gnome-settings-daemon-more-power-button-actions.patch
BuildRequires: cups-devel
BuildRequires: fdupes
@ -152,13 +152,12 @@ gnome-patch-translation-prepare po %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
# SLE-only patches start at 1000
%if !0%{?is_opensuse}
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
# Enable the patches by now for both Leap 15 and SLE 15, meanwhile we should justify the patches upstream.
%if 0%{?sle_version} >= 150000
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%endif
%build