rpms/gnome-settings-daemon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update for non-deprecated subscription management API

Browse Source 
Resolves: #2049734
This commit is contained in:
Ray Strode 2022-02-14 10:16:52 -05:00
parent f017741806
commit 1ec65c8b09
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnome-settings-daemon.spec
View File

@ -11,7 +11,7 @@
Name: gnome-settings-daemon
Version: 40.0.1
Release: 5%{?dist}
Release: 6%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
License: GPLv2+
@ -194,6 +194,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Mon Feb 14 2022 Ray Strode <rstrode@redhat.com> - 40.0.1-6
- Update for non-deprecated subscription management API
Resolves: #2049734
* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 40.0.1-5
- Fix the icon shown for subscription manager notifications
- Related: #1937113

16
subscription-manager-support.patch
View File

@ -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 <rhughes@redhat.com>
@ -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