From 5fd1d7bc0bf0fcd1664d7582d6b0fa0f16c12401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 27 Jan 2022 17:20:01 +0100 Subject: [PATCH] Do not hardcode OS name in welcome dialog It is odd to be welcomed to RHEL on CentOS ... Resolves: #2044040 --- 0001-welcomeDialog-Adapt-dialog-title.patch | 19 +++++++++++-------- gnome-shell.spec | 6 +++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/0001-welcomeDialog-Adapt-dialog-title.patch b/0001-welcomeDialog-Adapt-dialog-title.patch index bd696ae..dd812c7 100644 --- a/0001-welcomeDialog-Adapt-dialog-title.patch +++ b/0001-welcomeDialog-Adapt-dialog-title.patch @@ -1,20 +1,23 @@ -From 5033596c01e1d8fcdc9bd64a575a44f423b1ac51 Mon Sep 17 00:00:00 2001 +From 79049292451b9bb23ad92c572a438585ca37246b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 27 Oct 2021 15:18:20 +0200 Subject: [PATCH] welcomeDialog: Adapt dialog title Use RHEL branding instead of the upstream GNOME XX one. --- - js/ui/welcomeDialog.js | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + js/ui/welcomeDialog.js | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js -index 9d99f0035..17e2a277c 100644 +index 9d99f0035..783fd1108 100644 --- a/js/ui/welcomeDialog.js +++ b/js/ui/welcomeDialog.js -@@ -3,7 +3,6 @@ +@@ -1,9 +1,8 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + /* exported WelcomeDialog */ - const { Clutter, GObject, Shell, St } = imports.gi; +-const { Clutter, GObject, Shell, St } = imports.gi; ++const { Clutter, GLib, GObject, Shell, St } = imports.gi; -const Config = imports.misc.config; const Dialog = imports.ui.dialog; @@ -26,10 +29,10 @@ index 9d99f0035..17e2a277c 100644 _buildLayout() { - const [majorVersion] = Config.PACKAGE_VERSION.split('.'); - const title = _('Welcome to GNOME %s').format(majorVersion); -+ const title = _('Welcome to Red Hat Enterprise Linux'); ++ const title = _('Welcome to %s').format(GLib.get_os_info('NAME')); const description = _('If you want to learn your way around, check out the tour.'); const content = new Dialog.MessageDialogContent({ title, description }); -- -2.32.0 +2.33.1 diff --git a/gnome-shell.spec b/gnome-shell.spec index 6bda883..768856e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -2,7 +2,7 @@ Name: gnome-shell Version: 40.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -254,6 +254,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Thu Jan 27 2022 Florian Müllner - 40.8-2 +- Do not hardcode OS name in welcome dialog + Resolves: #2044040 + * Mon Jan 17 2022 Florian Müllner - 40.8-1 - Update to 40.8 Resolves: #2040061