Merge branch 'i9c' with version 40.0.1-11.el9_2 into i9

SOURCES/0001-Make-power-button-action-always-power-off-when-chass.patch

@@ -1,45 +0,0 @@
-From a94fd3a1a055c55f96adb1482cb96c7a541af7dd Mon Sep 17 00:00:00 2001
-From: Felipe Borges <felipeborges@gnome.org>
-Date: Wed, 15 Feb 2023 15:27:59 +0100
-Subject: [PATCH] Make power-button-action always power off when chassis=server
-
-Servers often don't support hibernation/suspend.
----
- .../org.gnome.settings-daemon.plugins.power.gschema.xml.in | 2 +-
- plugins/media-keys/gsd-media-keys-manager.c                | 7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-index e1a8787b..ef0ea530 100644
---- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-@@ -39,7 +39,7 @@
-     <key name="power-button-action" enum="org.gnome.settings-daemon.GsdPowerButtonActionType">
-       <default>'suspend'</default>
-       <summary>Power button action</summary>
--      <description>The action to take when the system power button is pressed. Virtual machines only honor the 'nothing' action, and will shutdown otherwise. Tablets always suspend, ignoring all the other action options.</description>
-+      <description>The action to take when the system power button is pressed. Virtual machines and servers only honor the 'nothing' action, and will shutdown otherwise. Tablets always suspend, ignoring all the other action options.</description>
-     </key>
-     <key name="power-saver-profile-on-low-battery" type="b">
-       <default>true</default>
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 60ff2ced..26d0e438 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -2042,9 +2042,10 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
-                 return;
- 
-         action_type = g_settings_get_enum (priv->power_settings, "power-button-action");
--        /* Always power off VMs, except when power-button-action is "nothing" */
--        if (g_strcmp0 (priv->chassis_type, "vm") == 0) {
--                g_warning_once ("Virtual machines only honor the 'nothing' power-button-action, and will shutdown otherwise");
-+        /* Always power off VMs and servers, except when power-button-action is "nothing" */
-+        if (g_strcmp0 (priv->chassis_type, "vm") == 0 ||
-+            g_strcmp0 (priv->chassis_type, "server")) {
-+                g_warning ("Virtual machines only honor the 'nothing' power-button-action, and will shutdown otherwise");
- 
-                 if (action_type != GSD_POWER_BUTTON_ACTION_NOTHING)
-                         power_action (manager, "PowerOff", FALSE);
--- 
-2.37.1
-

SPECS/gnome-settings-daemon.spec

@@ -11,7 +11,7 @@
 
 Name:           gnome-settings-daemon
 Version:        40.0.1
-Release:        10%{?dist}.inferit
+Release:        11%{?dist}.inferit
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 License:        GPLv2+
@@ -72,7 +72,6 @@ Patch00002: subscription-manager-support.patch
 Patch00003: im-module-setting-fix.patch
 Patch00004: print-notifications-clear-in-stop.patch
 Patch00005: 0001-power-Respect-the-nothing-power-button-action-for-VM.patch
-Patch00006: 0001-Make-power-button-action-always-power-off-when-chass.patch
 
 # MSVSphere
 Patch10000: 0001-Updated-Russain-translation.patch
@@ -201,10 +200,17 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Aug 31 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 40.0.1-11.inferit
+- Rebuilt for MSVSphere 9.2
+
 * Thu Aug 31 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 40.0.1-10.inferit
 - Updated Russian translation
 - Rebuilt for MSVSphere 9.2
 
+* Tue Mar 28 2023 Felipe Borges <feborges@redhat.com> - 40.0.1-11
+- Revert "power-button-action" always poweroff on Server chassis
+  Resolves: #2182380
+
 * Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 40.0.1-8
 - Rebuilt for MSVSphere 9.1.