Update almalinux patches for anaconda-34

This commit is contained in:
eabdullin 2022-01-27 16:56:26 +03:00
parent 72419caabb
commit f8735b8495
3 changed files with 47 additions and 47 deletions

View File

@ -9,7 +9,7 @@ diff -uprN a/data/anaconda-gtk.css b/data/anaconda-gtk.css
/* theme colors/images */
-@define-color product_bg_color @redhat;
-@define-color product_bg_color @fedora;
+@define-color product_bg_color @almalinux;
/* logo and sidebar classes */

View File

@ -1,16 +1,46 @@
diff -Naur anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop
--- anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop 2020-05-25 18:17:00.000000000 +0300
+++ anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop 2021-01-22 07:43:25.007068971 +0300
diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.desktop anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.desktop
--- anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.desktop 2021-12-09 18:57:10.000000000 +0300
+++ anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.desktop 2022-01-27 16:41:21.926325600 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Red Hat Enterprise Linux
-Name=Welcome to Fedora
+Name=Welcome to AlmaLinux
Exec=/usr/share/anaconda/gnome/rhel-welcome
Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false
Type=Application
diff -Naur anaconda-33.16.3.26/docs/intro.rst anaconda-33.16.3.26.alma/docs/intro.rst
--- anaconda-33.16.3.26/docs/intro.rst 2020-05-27 07:53:25.000000000 +0300
+++ anaconda-33.16.3.26.alma/docs/intro.rst 2021-01-22 07:43:24.989735757 +0300
diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.js
--- anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js 2021-12-09 18:57:10.000000000 +0300
+++ anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.js 2022-01-27 16:46:02.899570400 +0300
@@ -62,7 +62,7 @@
default_width: 600,
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Fedora"),
+ title: _("Welcome to AlmaLinux"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@@ -91,7 +91,7 @@
spacing: 16 });
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try Fedora"), true));
+ tryContent.add(makeLabel(_("Try AlmaLinux"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@@ -107,7 +107,7 @@
let installButton = new Gtk.Button({ child: installContent });
buttonBox.add(installButton);
- this._label = makeLabel(_("You are currently running Fedora from live media.\nYou can install Fedora now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
+ this._label = makeLabel(_("You are currently running AlmaLinux from live media.\nYou can install AlmaLinux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
mainGrid.add(this._label);
installButton.connect('clicked', Lang.bind(this,
diff -aruN anaconda-34.25.0.23/docs/intro.rst anaconda-34.25.0.23.alma/docs/intro.rst
--- anaconda-34.25.0.23/docs/intro.rst 2021-12-09 18:57:10.000000000 +0300
+++ anaconda-34.25.0.23.alma/docs/intro.rst 2022-01-27 16:42:10.434747900 +0300
@@ -1,8 +1,8 @@
Introduction to Anaconda
========================
@ -18,13 +48,13 @@ diff -Naur anaconda-33.16.3.26/docs/intro.rst anaconda-33.16.3.26.alma/docs/intr
-Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux
-and some other distributions.
+Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux,
+AlmaLinux, and some other distributions.
+AlmaLinux and some other distributions.
During installation, a target computer's hardware is identified and configured
and the appropriate file systems for the system's architecture are created.
diff -Naur anaconda-33.16.3.26/docs/iscsi.rst anaconda-33.16.3.26.alma/docs/iscsi.rst
--- anaconda-33.16.3.26/docs/iscsi.rst 2018-11-08 13:54:59.000000000 +0300
+++ anaconda-33.16.3.26.alma/docs/iscsi.rst 2021-01-22 07:43:24.988652432 +0300
diff -aruN anaconda-34.25.0.23/docs/iscsi.rst anaconda-34.25.0.23.alma/docs/iscsi.rst
--- anaconda-34.25.0.23/docs/iscsi.rst 2021-12-09 18:57:10.000000000 +0300
+++ anaconda-34.25.0.23.alma/docs/iscsi.rst 2022-01-27 16:43:34.244471700 +0300
@@ -139,7 +139,7 @@
The booting problems are either due to incorrectly generated dracut boot
arguments or they are simply dracut bugs.
@ -34,9 +64,9 @@ diff -Naur anaconda-33.16.3.26/docs/iscsi.rst anaconda-33.16.3.26.alma/docs/iscs
and so the issues can often be reproduced and debugged.
diff -Naur anaconda-33.16.3.26/pyanaconda/core/constants.py anaconda-33.16.3.26.alma/pyanaconda/core/constants.py
--- anaconda-33.16.3.26/pyanaconda/core/constants.py 2021-01-22 07:44:21.084349532 +0300
+++ anaconda-33.16.3.26.alma/pyanaconda/core/constants.py 2021-01-22 07:43:24.897653058 +0300
diff -aruN anaconda-34.25.0.23/pyanaconda/core/constants.py anaconda-34.25.0.23.alma/pyanaconda/core/constants.py
--- anaconda-34.25.0.23/pyanaconda/core/constants.py 2021-12-09 18:59:10.000000000 +0300
+++ anaconda-34.25.0.23.alma/pyanaconda/core/constants.py 2022-01-27 16:54:30.830920800 +0300
@@ -160,8 +160,8 @@
)
@ -48,33 +78,3 @@ diff -Naur anaconda-33.16.3.26/pyanaconda/core/constants.py anaconda-33.16.3.26.
)
# Storage messages
diff -Naur anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js
--- anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js 2021-02-02 13:55:25.000000000 +0300
+++ anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js 2021-07-23 06:36:40.836621474 +0300
@@ -59,7 +59,7 @@
default_width: 600,
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Red Hat Enterprise Linux"),
+ title: _("Welcome to AlmaLinux"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@@ -88,7 +88,7 @@
spacing: 16 });
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try RHEL"), true));
+ tryContent.add(makeLabel(_("Try AlmaLinux"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@@ -104,7 +104,7 @@
let installButton = new Gtk.Button({ child: installContent });
buttonBox.add(installButton);
- this._label = makeLabel(_("You are currently running Red Hat Enterprise Linux from live media.\nYou can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
+ this._label = makeLabel(_("You are currently running AlmaLinux from live media.\nYou can install AlmaLinux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
mainGrid.add(this._label);
installButton.connect('clicked', Lang.bind(this,

View File

@ -18,7 +18,7 @@ Source1: almalinux.conf
Patch1000: anaconda-almalinux-installer-colors.patch
Patch1001: anaconda-almalinux-disable-subscription.patch
Patch1002: anaconda-almalinux-disable-cdn-radiobutton.patch
Patch1003: anaconda-almalinux-remove-visible-rh-references.patch
Patch1003: anaconda-almalinux-remove-visible-fedrora-references.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).