rpms/anaconda
5
0
Fork 0
Code Issues Pull Requests Releases Activity

AlmaLinux changes

Browse Source
This commit is contained in:
eabdullin 2025-01-16 11:06:19 +03:00
parent e6a73eab58
commit ff5265c234
4 changed files with 121 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Add-Minimal-repo-support.patch Normal file
View File

@ -0,0 +1,24 @@
From 2b5791f0ed5a4b6886b49eeefeed66511e7218ce Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 16:50:16 +0000
Subject: [PATCH 1/3] Add Minimal repo support
---
pyanaconda/core/constants.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 5232e6d..8e87274 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -58,6 +58,7 @@ DEFAULT_REPOS = [
"BaseOS", # Used by RHEL
"baseos", # Used by CentOS Stream
"eln-baseos", # Used by Fedora ELN
+ "Minimal", # Used by AlmaLinux
]
DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"
--
2.43.5

25
0002-Change-anaconda-background-color.patch Normal file
View File

@ -0,0 +1,25 @@
From 7d0eaa2ebb521e327b98171689e4731a7db5d503 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 16:59:05 +0000
Subject: [PATCH 2/3] Change anaconda background color
---
data/anaconda-gtk.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
index f83cf15..e5d859c 100644
--- a/data/anaconda-gtk.css
+++ b/data/anaconda-gtk.css
@@ -95,7 +95,7 @@ infobar.error box {
* to be overridden by a stylesheet in product.img.
*/
-@define-color anaconda_bg_color #2f4265;
+@define-color anaconda_bg_color #0b2335;
.logo-sidebar {
background-color: @anaconda_bg_color;
--
2.43.5

55
0003-Remove-visible-Fedora-references.patch Normal file
View File

@ -0,0 +1,55 @@
From 36a77712950b1462573ade28c1bd6f175a201174 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 17:03:55 +0000
Subject: [PATCH 3/3] Remove visible Fedora references
---
data/liveinst/gnome/fedora-welcome.js | 6 +++---
.../liveinst/gnome/org.fedoraproject.welcome-screen.desktop | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js
index fc42e5d..ce60209 100755
--- a/data/liveinst/gnome/fedora-welcome.js
+++ b/data/liveinst/gnome/fedora-welcome.js
@@ -46,7 +46,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
}
constructor(application) {
- const title = _('Welcome to Fedora!');
+ const title = _('Welcome to AlmaLinux!');
super({
application,
title,
@@ -58,7 +58,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
const statusPage = new Adw.StatusPage({
title,
iconName: 'fedora-logo-icon',
- description: _('This live media can be used to install Fedora or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
+ description: _('This live media can be used to install AlmaLinux or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
});
this.content.set_child(statusPage);
@@ -71,7 +71,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
statusPage.set_child(buttonBox);
const installButton = new Gtk.Button({
- label: _('Install Fedora…'),
+ label: _('Install AlmaLinux…'),
actionName: 'window.install-fedora',
});
installButton.add_css_class('pill');
diff --git a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
index c3551b1..8c9065b 100644
--- a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
+++ b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Fedora
+Name=Welcome to AlmaLinux
Icon=fedora-logo-icon
Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false
--
2.43.5

18
anaconda.spec
View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 40.22.3.20
Release: 1%{?dist}
Release: 1%{?dist}.alma.1
License: GPL-2.0-or-later
URL: http://fedoraproject.org/wiki/Anaconda
@ -12,6 +12,11 @@ URL: http://fedoraproject.org/wiki/Anaconda
# make dist
Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
# AlmaLinux Patch
Patch1001: 0001-Add-Minimal-repo-support.patch
Patch1002: 0002-Change-anaconda-background-color.patch
Patch1003: 0003-Remove-visible-Fedora-references.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -20,9 +25,13 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
%bcond_without live
%define blivetguiver 2.4.2-3
%else
%if 0%{?almalinux}
%bcond_without live
%else
%bcond_with glade
%bcond_with live
%endif
%endif
%define dasbusver 1.3
%define dbusver 1.2.3
%define dnfver 3.6.0
@ -351,6 +360,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep
%autosetup -p 1
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po
%build
# use actual build-time release number, not tarball creation time release number
%configure ANACONDA_RELEASE=%{release} %{!?with_glade:--disable-glade}
@ -481,6 +493,10 @@ rm -rf \
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Thu Jan 16 2025 Eduard Abdullin <eabdullin@almalinux.org> - 40.22.3.20-1.alma.1
- Apply AlmaLinux patches
- Enable live subpackage by defaul on AlmaLinux
* Tue Jan 14 2025 Katerina Koukiou <k.koukiou@gmail.com> - 40.22.3.20-1
- Avoid side effect of ask rdp methods (jkonecny)
Related: RHEL-69940