Merge 'c10s' into 'a10s'
This commit is contained in:
commit
e6a73eab58
1
.gitignore
vendored
1
.gitignore
vendored
@ -414,3 +414,4 @@
|
||||
/anaconda-40.22.3.17.tar.bz2
|
||||
/anaconda-40.22.3.18.tar.bz2
|
||||
/anaconda-40.22.3.19.tar.bz2
|
||||
/anaconda-40.22.3.20.tar.bz2
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.102.2.
|
||||
The file was generated using packit 0.106.0.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Graphical system installer
|
||||
Name: anaconda
|
||||
Version: 40.22.3.19
|
||||
Release: 1%{?dist}.alma.1
|
||||
Version: 40.22.3.20
|
||||
Release: 1%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://fedoraproject.org/wiki/Anaconda
|
||||
|
||||
@ -12,11 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda
|
||||
# make dist
|
||||
Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
# AlmaLinux patches
|
||||
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).
|
||||
|
||||
@ -25,13 +20,9 @@ Patch1003: 0003-Remove-visible-Fedora-references.patch
|
||||
%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
|
||||
@ -360,9 +351,6 @@ 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}
|
||||
@ -493,9 +481,24 @@ rm -rf \
|
||||
%{_prefix}/libexec/anaconda/dd_*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 08 2025 Eduard Abdullin <eabdullin@almalinux.org> - 40.22.3.19-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
|
||||
- Do not crash if RDP is selected after regular GUI startup failed (#2326410)
|
||||
(mkolman)
|
||||
Resolves: RHEL-69940
|
||||
- Only match liveinst.desktop app in live environment (ales.astone)
|
||||
Resolves: RHEL-67390
|
||||
- Show correct taskbar icon in Wayland (ales.astone)
|
||||
Resolves: RHEL-67390
|
||||
- Hide server-side-decorations in Wayland (ales.astone)
|
||||
Resolves: RHEL-67390
|
||||
- liveinst: Allow running as a Wayland-native application (neal)
|
||||
Resolves: RHEL-67390
|
||||
- Support leavebootorder for bootupd (jkonecny)
|
||||
Resolves: RHEL-40896
|
||||
- bootupd: call bootupctl with --update-firmware (awilliam)
|
||||
Resolves: RHEL-40896
|
||||
|
||||
* Fri Dec 13 2024 Paweł Poławski <ppolawsk@redhat.com> - 40.22.3.19-1
|
||||
- Update to version 40.22.3.19
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (anaconda-40.22.3.19.tar.bz2) = 3c8c062f095387a1b04696dcf074ed95e0b416ac666e9f9d05d1ade21260f5ed7c1365e0eaa8dc1bbf7e8cb96feab402dd439aeaed51538eaebc02411ee3983c
|
||||
SHA512 (anaconda-40.22.3.20.tar.bz2) = f82b9f4d33d66d28a077448688093688893afcff818eb268b44d993f21915c41d0683f52deb390c03d6d9ea238c1ef45f8dc6a9b595f0af483789d9d4d680140
|
||||
|
||||
Loading…
Reference in New Issue
Block a user