From 61139ff14e3b070147fee1432aa74b4bb4a42b10 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 07:24:12 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- SOURCES/subscription-manager-support.patch | 26 ---------------------- SPECS/gnome-session.spec | 17 ++++++++++++-- 2 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 SOURCES/subscription-manager-support.patch diff --git a/SOURCES/subscription-manager-support.patch b/SOURCES/subscription-manager-support.patch deleted file mode 100644 index fc3ff3e..0000000 --- a/SOURCES/subscription-manager-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 523602887f92b448b497e99bf56d0b9f1ef376f7 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Mon, 6 Sep 2021 21:12:38 +0200 -Subject: [PATCH] data: Require org.gnome.SettingsDaemon.Subscription - -Make sure the gnome-settings-daemon subman plugin gets started on -session startup. ---- - data/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/meson.build b/data/meson.build -index e02b80d3..1684a99e 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -24,6 +24,7 @@ required_components = { - 'org.gnome.SettingsDaemon.Sharing', - 'org.gnome.SettingsDaemon.Smartcard', - 'org.gnome.SettingsDaemon.Sound', -+ 'org.gnome.SettingsDaemon.Subscription', - 'org.gnome.SettingsDaemon.UsbProtection', - 'org.gnome.SettingsDaemon.Wacom', - 'org.gnome.SettingsDaemon.XSettings', --- -2.31.1 - diff --git a/SPECS/gnome-session.spec b/SPECS/gnome-session.spec index 254e2a0..1b82a6c 100644 --- a/SPECS/gnome-session.spec +++ b/SPECS/gnome-session.spec @@ -9,7 +9,7 @@ Name: gnome-session Version: 40.1.1 -Release: 7%{?dist} +Release: 9%{?dist} Summary: GNOME session manager License: GPLv2+ @@ -30,8 +30,9 @@ Patch30001: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch # This should go upstream once systemd has a generic interface for this Patch40001: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch -# subscription manager support +%if %{undefined centos} Patch50001: subscription-manager-support.patch +%endif Patch60001: 0001-gnome-session-don-t-validate-shell-before-using-it.patch @@ -79,6 +80,10 @@ Requires: gsettings-desktop-schemas >= 0.1.7 Requires: dbus +%if %{undefined centos} +Recommends: subscription-manager +%endif + %description gnome-session manages a GNOME desktop or GDM login session. It starts up the other core GNOME components and handles logout and saving the session. @@ -151,6 +156,14 @@ cp $RPM_SOURCE_DIR/gnome-xorg.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome %{_userunitdir}/gnome-launched-.scope.d/ %changelog +* Thu Jan 04 2024 Ray Strode - 40.1.1-9 +- Make subscription-manager dependency softer + Related: RHEL-20449 + +* Fri Jun 16 2023 Ray Strode - 40.1.1-8 +- Add hard dependency on subscription-manager + Resolves: #2175675 + * Tue Dec 13 2022 Ray Strode - 40.1.1-7 - Demote expected log messages from warnings to debug level Resolves: #2044212