From f017741806833f8efac5a82dba6ea57cd8e16abb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 8 Sep 2021 13:27:52 +0200 Subject: [PATCH] Fix the icon shown for subscription manager notifications Related: #1937113 --- gnome-settings-daemon.spec | 6 ++- subscription-manager-support.patch | 82 +++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 083fd41..a9ea634 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -11,7 +11,7 @@ Name: gnome-settings-daemon Version: 40.0.1 -Release: 4%{?dist} +Release: 5%{?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 +* Wed Sep 08 2021 Kalev Lember - 40.0.1-5 +- Fix the icon shown for subscription manager notifications +- Related: #1937113 + * Thu Sep 02 2021 Kalev Lember - 40.0.1-4 - Forward port subscription manager support from RHEL 8 - Resolves: #1937113 diff --git a/subscription-manager-support.patch b/subscription-manager-support.patch index 08151fa..83a5cdd 100644 --- a/subscription-manager-support.patch +++ b/subscription-manager-support.patch @@ -1,7 +1,7 @@ From d85d6eb0ceeaabc65f71ec9b163d00a1e0840b81 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 20 Aug 2020 11:16:09 -0400 -Subject: [PATCH 01/18] subman: Add a new plugin to provide system subscription +Subject: [PATCH 01/19] subman: Add a new plugin to provide system subscription registration --- @@ -1790,7 +1790,7 @@ index 00000000..1ed3a0ea From dd5490fb4e962d82598bbf83d0dc600c030a10a3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 27 Jun 2019 16:12:00 +0200 -Subject: [PATCH 02/18] subman: Add InstalledProducts dbus property for g-c-c +Subject: [PATCH 02/19] subman: Add InstalledProducts dbus property for g-c-c --- plugins/subman/gsd-subscription-manager.c | 135 ++++++++++++++++++++++ @@ -2040,7 +2040,7 @@ index 08b13fa6..a8c18a26 100644 From c67554c7ab37a4fea6abc80ca199de2671c34ee2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 28 Jun 2019 18:10:36 +0200 -Subject: [PATCH 03/18] subman: Increase RHSM dbus call timeouts +Subject: [PATCH 03/19] subman: Increase RHSM dbus call timeouts Increase the dbus timeouts to 5 minutes as the register/unregister calls seem to routinely take more than a minute. @@ -2118,7 +2118,7 @@ index 182f7190..af7a82e9 100644 From efcbbf6a50eca888bde03f4425578bab9916ebaa Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 20 Aug 2020 11:20:47 -0400 -Subject: [PATCH 04/18] subman: Drop userlang field +Subject: [PATCH 04/19] subman: Drop userlang field It's currently always erroneously set to empty string. @@ -2209,7 +2209,7 @@ index a8c18a26..46f051a5 100644 From 3ff6f889049462b2b3029e26f7251e39904a3ddf Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 15:04:17 -0500 -Subject: [PATCH 05/18] subman: Use user locale for registration/subscription +Subject: [PATCH 05/19] subman: Use user locale for registration/subscription operations This makes sure that error messages are in the correct locale. @@ -2306,7 +2306,7 @@ index af7a82e9..f84e91bf 100644 From 7bdca155acbe043c82e7abd9d2072c6502e10270 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 20 Aug 2020 13:34:19 -0400 -Subject: [PATCH 06/18] subman: Handle subscription-manager giving invalid +Subject: [PATCH 06/19] subman: Handle subscription-manager giving invalid status better subscription-manager potentially returns status messages that the @@ -2435,7 +2435,7 @@ index 46f051a5..e2c16056 100644 From 74fe856b8d2826520a7d324abe9727097cce8cfb Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 25 Aug 2020 10:34:03 -0400 -Subject: [PATCH 07/18] subman: Force re-subscribe if the admin already +Subject: [PATCH 07/19] subman: Force re-subscribe if the admin already subscribed It's possible for an admin to to half-enroll the system with RHN, @@ -2513,7 +2513,7 @@ index f84e91bf..3931ef2e 100644 From c0ca9c55632a52371acbbb76a279f28e26532e5e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 25 Aug 2020 16:20:42 -0400 -Subject: [PATCH 08/18] subman: Don't send secrets through command line +Subject: [PATCH 08/19] subman: Don't send secrets through command line The command line is introspectable with "ps", and it even gets logged to syslog, so it's not suitable for passing secrets. @@ -2763,7 +2763,7 @@ index bfd073b6..e4b4589d 100644 From 590ad191dc3fec6c21dbfd22a5fc757a1409edbf Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 21 Jan 2021 09:52:19 -0500 -Subject: [PATCH 09/18] subman: Don't treat failure to attach as fatal +Subject: [PATCH 09/19] subman: Don't treat failure to attach as fatal Many organizations don't require specific subscriptions to get updates (called "simple content access"). At the moment, @@ -2874,7 +2874,7 @@ index edf1e41f..53a4d56b 100644 From 8c076516d48b5603132d3586a8040ef46011330f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 11:24:36 -0500 -Subject: [PATCH 10/18] subman: Add new no-installed-products state +Subject: [PATCH 10/19] subman: Add new no-installed-products state It's possible, though unlikley, the system has no packages installed from Red Hat supported package sets. @@ -2973,7 +2973,7 @@ index 0838d490..46f8d35c 100644 From fad6580e4cf9e7f350d0d537a064bbb439457540 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 11:26:40 -0500 -Subject: [PATCH 11/18] subman: Fix some build warnings +Subject: [PATCH 11/19] subman: Fix some build warnings --- plugins/subman/gsd-subscription-manager.c | 8 ++++---- @@ -3012,7 +3012,7 @@ index 46f8d35c..1f9ca447 100644 From 6c99ee2eee9a1be3765db5a7b80ae86a4444f00b Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 11:27:42 -0500 -Subject: [PATCH 12/18] subman: Add DBus API to subscribe for updates on +Subject: [PATCH 12/19] subman: Add DBus API to subscribe for updates on already registered system It's possible an admin may have registered their system without @@ -3110,7 +3110,7 @@ index 1f9ca447..705f8b11 100644 From b340559f941ebd012711f357a8a0095776222d7a Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 11:34:03 -0500 -Subject: [PATCH 13/18] subman: Improve subscription status handling +Subject: [PATCH 13/19] subman: Improve subscription status handling This commit improves how subscription-manager status is parsed to give more detailed information about subscription @@ -3189,7 +3189,7 @@ index 705f8b11..6d80bfa9 100644 From e2caf6d353dfe6e3314be9c2e604dd4c025d7dc1 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 11:55:19 -0500 -Subject: [PATCH 14/18] subman: Drop "LAST" from status enum +Subject: [PATCH 14/19] subman: Drop "LAST" from status enum It's unused, so get rid of it. --- @@ -3215,7 +3215,7 @@ index f8a3d9f4..88226564 100644 From 26ff144e7c5230f8b27a27e6eef5c109ae31ab0f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 24 Jan 2021 12:41:20 -0500 -Subject: [PATCH 15/18] subman: Clean up notification behavior +Subject: [PATCH 15/19] subman: Clean up notification behavior Notifications were only displayed for some status transitions. @@ -3439,7 +3439,7 @@ index 6d80bfa9..aaccbbc6 100644 From e4ecab298c016127ab75634e1e04c6ff4eab3c4e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 12 Feb 2021 14:51:29 +0100 -Subject: [PATCH 16/18] subman: Update POTFILES.in +Subject: [PATCH 16/19] subman: Update POTFILES.in --- po/POTFILES.in | 2 ++ @@ -3465,7 +3465,7 @@ index e721f526..7d5b7e9d 100644 From 0da1131d81b5ddee23d5afe9c21e8c0963180cc5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 6 Sep 2021 21:31:14 +0200 -Subject: [PATCH 17/18] subman: Don't force X11 backend +Subject: [PATCH 17/19] subman: Don't force X11 backend All of this should work just fine with Wayland. --- @@ -3491,7 +3491,7 @@ index 28ac995b..839c1b79 100644 From 7b2f231fd6c87ca929bdd099177c53b14ccaaad5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Sep 2021 13:08:12 +0200 -Subject: [PATCH 18/18] subman: Fix desktop file hint for notifications +Subject: [PATCH 18/19] subman: Fix desktop file hint for notifications We don't have a separate subman-panel. It's all part of info-overview-panel, as of now at least. @@ -3533,3 +3533,49 @@ index aaccbbc6..be978fc3 100644 -- 2.31.1 + +From b610a954773262e60610c7732fbfeddbb3fa7fa0 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Wed, 8 Sep 2021 13:25:07 +0200 +Subject: [PATCH 19/19] subman: Use preferences-system icon for notifications + +Use it as a placeholder until we get a new icon for subscription +management. +--- + plugins/subman/gsd-subscription-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/subman/gsd-subscription-manager.c b/plugins/subman/gsd-subscription-manager.c +index be978fc3..dbb81098 100644 +--- a/plugins/subman/gsd-subscription-manager.c ++++ b/plugins/subman/gsd-subscription-manager.c +@@ -1043,7 +1043,7 @@ gsd_subscription_manager_init (GsdSubscriptionManager *manager) + priv->notification_expired = + notify_notification_new (_("Subscription Has Expired"), + _("Add or renew a subscription to continue receiving software updates."), +- NULL); ++ "preferences-system"); + notify_notification_set_app_name (priv->notification_expired, _("Subscription")); + notify_notification_set_hint_string (priv->notification_expired, "desktop-entry", "gnome-info-overview-panel"); + notify_notification_set_hint_string (priv->notification_expired, "x-gnome-privacy-scope", "system"); +@@ -1059,7 +1059,7 @@ gsd_subscription_manager_init (GsdSubscriptionManager *manager) + priv->notification_registered = + notify_notification_new (_("Registration Successful"), + _("The system has been registered and software updates have been enabled."), +- NULL); ++ "preferences-system"); + notify_notification_set_app_name (priv->notification_registered, _("Subscription")); + notify_notification_set_hint_string (priv->notification_registered, "desktop-entry", "gnome-info-overview-panel"); + notify_notification_set_hint_string (priv->notification_registered, "x-gnome-privacy-scope", "system"); +@@ -1071,7 +1071,7 @@ gsd_subscription_manager_init (GsdSubscriptionManager *manager) + priv->notification_registration_required = + notify_notification_new (_("System Not Registered"), + _("Please register your system to receive software updates."), +- NULL); ++ "preferences-system"); + notify_notification_set_app_name (priv->notification_registration_required, _("Subscription")); + notify_notification_set_hint_string (priv->notification_registration_required, "desktop-entry", "gnome-info-overview-panel"); + notify_notification_set_hint_string (priv->notification_registration_required, "x-gnome-privacy-scope", "system"); +-- +2.31.1 +