From 913c9e071dc9a5f73e805ccf487be68bf958d044 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 01:22:19 +0000
Subject: import gnome-control-center-3.28.2-21.el8


---

diff --git a/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch b/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch
new file mode 100644
index 0000000..35218f6
--- /dev/null
+++ b/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch
@@ -0,0 +1,25 @@
+From 7b3c55a3e6c53a54a140c59c8a18d9b18e1cc4e5 Mon Sep 17 00:00:00 2001
+From: Ethan Hsieh <ethan.hsieh@canonical.com>
+Date: Thu, 2 May 2019 13:28:09 +0800
+Subject: [PATCH] power: correct the value of 90 minutes to 5400
+
+---
+ panels/power/power.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/power/power.ui b/panels/power/power.ui
+index 2c113b238..60fdc10dc 100644
+--- a/panels/power/power.ui
++++ b/panels/power/power.ui
+@@ -39,7 +39,7 @@
+       </row>
+       <row>
+         <col id="0" translatable="yes">90 minutes</col>
+-        <col id="1">4800</col>
++        <col id="1">5400</col>
+       </row>
+       <row>
+         <col id="0" translatable="yes">100 minutes</col>
+-- 
+2.24.0
+
diff --git a/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch b/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch
new file mode 100644
index 0000000..77099f8
--- /dev/null
+++ b/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch
@@ -0,0 +1,36 @@
+From 9dd43182ecb9f8406a1aecd0719f2c5225d3101e Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Thu, 28 Nov 2019 15:47:02 +0100
+Subject: [PATCH 1/3] sound: Ensure to preserve sound theme when changing from
+ default
+
+The sound theme change itself triggers signals that are handled here
+in the GSettings handlers, possibly resulting in it changing the
+theme back to default. Ensure we are handling a real change here,
+the sound theme will be updated through other means (eg. the row
+changed handler).
+---
+ panels/sound/gvc-sound-theme-chooser.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/panels/sound/gvc-sound-theme-chooser.c b/panels/sound/gvc-sound-theme-chooser.c
+index 93eeb155c..9d1051f04 100644
+--- a/panels/sound/gvc-sound-theme-chooser.c
++++ b/panels/sound/gvc-sound-theme-chooser.c
+@@ -632,11 +632,11 @@ update_theme (GvcSoundThemeChooser *chooser)
+                         load_theme_name (DEFAULT_THEME,
+                                          &chooser->current_parent);
+                 }
++
++                update_alerts_from_theme_name (chooser, chooser->current_theme);
+         }
+ 
+         gtk_widget_set_sensitive (chooser->selection_box, events_enabled);
+-
+-        update_alerts_from_theme_name (chooser, chooser->current_theme);
+ }
+ 
+ static GObject *
+-- 
+2.24.0
+
diff --git a/SPECS/gnome-control-center.spec b/SPECS/gnome-control-center.spec
index 4696f0c..5bcbc3a 100644
--- a/SPECS/gnome-control-center.spec
+++ b/SPECS/gnome-control-center.spec
@@ -10,7 +10,7 @@
 
 Name:           gnome-control-center
 Version:        3.28.2
-Release:        19%{?dist}
+Release:        21%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -47,8 +47,10 @@ Patch16:        0001-network-Use-connect-object-on-signals.patch
 Patch17:        0001-sharing-Remember-the-password-on-remote-desktop-shar.patch
 Patch18:        0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch
 
-Patch20:	0001-user-Support-devices-with-more-than-5-enroll-steps.patch
+Patch20:        0001-user-Support-devices-with-more-than-5-enroll-steps.patch
 Patch21:        backport-wacom-tool-id-fixes.patch
+Patch22:        0001-power-correct-the-value-of-90-minutes-to-5400.patch
+Patch23:        0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch
 
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
@@ -222,6 +224,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Mon Jun 29 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-21
+- Honor sound theme changes when changing from the default theme
+- Resolves: #1706008
+
+* Mon Jun 29 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-20
+- Fix 90min automatic sleep option to not last 80min
+- Resolves: #1706076
+
 * Fri Feb 21 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-19
 - Backport tool serial/ID detection fixes
 - Resolves: #1782517