From a45fda9e074424307330fff95ca1821602ce7522 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Apr 2022 05:41:46 -0400 Subject: [PATCH] import gnome-settings-daemon-40.0.1-6.el9 --- SOURCES/subscription-manager-support.patch | 16 +++++----------- SPECS/gnome-settings-daemon.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/SOURCES/subscription-manager-support.patch b/SOURCES/subscription-manager-support.patch index 83a5cdd..5624f0a 100644 --- a/SOURCES/subscription-manager-support.patch +++ b/SOURCES/subscription-manager-support.patch @@ -210,7 +210,7 @@ new file mode 100644 index 00000000..182f7190 --- /dev/null +++ b/plugins/subman/gsd-subman-helper.c -@@ -0,0 +1,378 @@ +@@ -0,0 +1,372 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2019 Richard Hughes @@ -477,9 +477,11 @@ index 00000000..182f7190 + return G_IO_ERROR_NOT_FOUND; + } + -+ /* no options */ ++ /* enable_content=1 auto attaches the subscription */ + subman_options = g_variant_builder_new (G_VARIANT_TYPE("a{ss}")); + ++ g_variant_builder_add (subman_options, "{ss}", "enable_content", "1"); ++ + /* set registration server */ + if (hostname == NULL || hostname[0] == '\0') + hostname = g_strdup ("subscription.rhsm.redhat.com"); @@ -578,17 +580,9 @@ index 00000000..182f7190 + return G_IO_ERROR_NOT_INITIALIZED; + } + -+ /* wait for rhsmd to notice the new config */ -+ g_usleep (G_USEC_PER_SEC * 5); -+ -+ /* auto-attach */ -+ if (!_helper_auto_attach (&error)) { -+ g_printerr ("Failed to AutoAttach: %s\n", error->message); -+ return G_IO_ERROR_NOT_INITIALIZED; -+ } -+ + return EXIT_SUCCESS; +} ++ diff --git a/plugins/subman/gsd-subscription-manager.c b/plugins/subman/gsd-subscription-manager.c new file mode 100644 index 00000000..08b13fa6 diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec index 0f06bfc..1d2d892 100644 --- a/SPECS/gnome-settings-daemon.spec +++ b/SPECS/gnome-settings-daemon.spec @@ -11,7 +11,7 @@ Name: gnome-settings-daemon Version: 40.0.1 -Release: 5%{?dist}.1 +Release: 6%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -194,17 +194,17 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog -* Wed Sep 15 2021 Kalev Lember - 40.0.1-5.1 -- Rebuilt -- Related: #2002166 +* Mon Feb 14 2022 Ray Strode - 40.0.1-6 +- Update for non-deprecated subscription management API + Resolves: #2049734 * Wed Sep 08 2021 Kalev Lember - 40.0.1-5 - Fix the icon shown for subscription manager notifications -- Related: #2002166 +- Related: #1937113 * Thu Sep 02 2021 Kalev Lember - 40.0.1-4 - Forward port subscription manager support from RHEL 8 -- Resolves: #2002166 +- Resolves: #1937113 * Thu Aug 19 2021 Carlos Garnacho - 40.0.1-3 - Backport power saving changes