Fixes

0001-Add-Minimal-repo-support.patch

@@ -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
+

0002-Change-anaconda-background-color.patch

@@ -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 #2f4265;
+ 
+ .logo-sidebar {
+     background-color: @anaconda_bg_color;
+-- 
+2.43.5
+

0003-Remove-visible-Fedora-references.patch

@@ -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
+

anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 41.35
+Version: 40.22.3.13
-Release: 2%{?dist}
+Release: 100%{?dist}.oreon.1
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -12,8 +12,10 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
-# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2321249
+# Oreon patches
-Patch0: 0001-hotfix-Disable-broken-Xvnc-feature.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).
@@ -23,7 +25,7 @@ Patch0: 0001-hotfix-Disable-broken-Xvnc-feature.patch
 %define dasbusver 1.3
 %define dbusver 1.2.3
 %define dnfver 3.6.0
-%define dracutver 034-7
+%define dracutver 101-1
 %define fcoeutilsver 1.0.12-3.20100323git
 %define gettextver 0.19.8
 %define gtk3ver 3.22.17
@@ -32,10 +34,9 @@ Patch0: 0001-hotfix-Disable-broken-Xvnc-feature.patch
 %define libarchivever 3.0.4
 %define libblockdevver 2.1
 %define libreportanacondaver 2.0.21-1
-%define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
-%define pykickstartver 3.58-1
+%define pykickstartver 3.52.5-1
 %define pypartedver 2.5-2
 %define pythonblivetver 1:3.9.0-1
 %define rpmver 4.15.0
@@ -43,6 +44,7 @@ Patch0: 0001-hotfix-Disable-broken-Xvnc-feature.patch
 %define subscriptionmanagerver 1.26
 %define utillinuxver 2.15.1
 %define rpmostreever 2023.2
+%define s390utilscorever 2.31.0
 
 BuildRequires: libtool
 BuildRequires: gettext-devel >= %{gettextver}
@@ -54,7 +56,6 @@ BuildRequires: gobject-introspection-devel
 %if %{with glade}
 BuildRequires: glade-devel
 %endif
-BuildRequires: libxklavier-devel >= %{libxklavierver}
 BuildRequires: make
 BuildRequires: pango-devel
 BuildRequires: python3-devel
@@ -81,9 +82,6 @@ Summary: Core of the Anaconda installer
 # core/signal.py is under MIT
 License: GPL-2.0-or-later AND MIT
 Requires: python3-libs
-%if 0%{?rhel} > 10 || 0%{?fedora} > 40
-Requires: python3-crypt-r
-%endif
 Requires: python3-dnf >= %{dnfver}
 Requires: python3-blivet >= %{pythonblivetver}
 Requires: python3-blockdev >= %{libblockdevver}
@@ -120,13 +118,15 @@ Requires: NetworkManager-team
 %endif
 %ifarch s390 s390x
 Requires: openssh
+Requires: s390utils-core >= %{s390utilscorever}
+Requires: dracut-network >= %{dracutver}
 %endif
 Requires: NetworkManager >= %{nmver}
 Requires: NetworkManager-libnm >= %{nmver}
 Requires: kbd
 Requires: chrony
 Requires: systemd
-%if 0%{?rhel} > 10 || 0%{?fedora}
+%if ! 0%{?rhel}
 Requires: systemd-resolved
 %endif
 Requires: python3-pid
@@ -135,7 +135,7 @@ Requires: python3-pid
 Requires: crypto-policies
 Requires: /usr/bin/update-crypto-policies
 
-# required because of the rescue mode and VNC question
+# required because of the rescue mode and RDP question
 Requires: anaconda-tui = %{version}-%{release}
 
 # Make sure we get the en locale one way or another
@@ -161,7 +161,6 @@ Obsoletes: booty <= 0.107-1
 %description core
 The anaconda-core package contains the program which was used to install your
 system.
-# do not provide the live subpackage on RHEL
 
 %package live
 Summary: Live installation specific files and dependencies
@@ -169,6 +168,7 @@ BuildArchitectures: noarch
 BuildRequires: desktop-file-utils
 # live installation currently implies a graphical installation
 Requires: anaconda-gui = %{version}-%{release}
+Requires: usermode
 Requires: zenity
 Requires: xisxwayland
 Recommends: xhost
@@ -248,16 +248,20 @@ Requires: zram-generator
 # needed for proper driver disk support - if RPMs must be installed, a repo is needed
 Requires: createrepo_c
 # Display stuff moved from lorax templates
-Requires: xorg-x11-drivers
-Requires: xorg-x11-server-Xorg
-Requires: xrandr
-Requires: xrdb
-Requires: dbus-x11
 Requires: gsettings-desktop-schemas
 Requires: nm-connection-editor
 Requires: librsvg2
 Requires: gnome-kiosk
+# pulling them in every time anaconda-gui is installed
+Requires: gnome-remote-desktop
+# needed to generate RDP certs at runtime
+Requires: openssl
+# needed by GNOME kiosk but not declared a as explicit dep,
+# instead expected to be declared like this according to the
+# maintainers
+Requires: mesa-dri-drivers
 Requires: brltty
+Requires: python3-pam
 # dependencies for rpm-ostree payload module
 Requires: rpm-ostree >= %{rpmostreever}
 Requires: ostree
@@ -265,8 +269,6 @@ Requires: ostree
 Requires: skopeo
 # External tooling for managing NVMe-FC devices in the installation environment
 Requires: nvme-cli
-# Needed for bootc
-Requires: podman
 
 %description install-img-deps
 The anaconda-install-img-deps metapackage lists all boot.iso installation
@@ -282,8 +284,6 @@ Requires: python3-meh-gui >= %{mehver}
 Requires: python3-xkbregistry
 Requires: adwaita-icon-theme
 Requires: tecla
-Requires: tigervnc-server-minimal
-Requires: libxklavier >= %{libxklavierver}
 Requires: nm-connection-editor
 %ifnarch s390 s390x
 Requires: NetworkManager-wifi
@@ -295,6 +295,8 @@ Requires: system-logos
 
 # Needed to compile the gsettings files
 BuildRequires: gsettings-desktop-schemas
+# Needed for gdbus-codegen
+BuildRequires: glib2-devel
 
 %description gui
 This package contains graphical user interface for the Anaconda installer.
@@ -344,6 +346,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
 %prep
 %autosetup -p 1
 
+sed -e 's/RHEL/Oreon/g' -i po/*.po
+sed -e 's/Red Hat Enterprise Linux/Oreon/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}
@@ -361,16 +366,6 @@ mkdir %{buildroot}%{_datadir}/anaconda/post-scripts
 
 # required for live installations
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
-# Remove all live-installer files from the buildroot
-rm -rf \
-  %{buildroot}/%{_sysconfdir}/xdg/autostart/liveinst-setup.desktop \
-  %{buildroot}/%{_bindir}/liveinst \
-  %{buildroot}/%{_libexecdir}/liveinst-setup.sh \
-  %{buildroot}/%{_datadir}/anaconda/gnome \
-  %{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome \
-  %{buildroot}/%{_datadir}/anaconda/gnome/org.fedoraproject.welcome-screen.desktop \
-  %{buildroot}/%{_datadir}/polkit-1/actions/* \
-  %{buildroot}/%{_datadir}/applications/liveinst.desktop
 
 # Add localization files
 %find_lang %{name}
@@ -398,6 +393,7 @@ rm -rf \
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
+%{_sysconfdir}/pam.d/anaconda
 %{_prefix}/libexec/anaconda
 %exclude %{_datadir}/anaconda/gnome
 %exclude %{_datadir}/anaconda/pixmaps
@@ -418,7 +414,6 @@ rm -rf \
 %config %{_sysconfdir}/%{name}/conf.d/*
 %dir %{_sysconfdir}/%{name}/profile.d
 %config %{_sysconfdir}/%{name}/profile.d/*
-# do not provide the live subpackage on RHEL
 
 %files live
 %{_bindir}/liveinst
@@ -428,7 +423,6 @@ rm -rf \
 %{_datadir}/anaconda/gnome
 %{_sysconfdir}/xdg/autostart/*.desktop
 
-
 %files gui
 %{python3_sitearch}/pyanaconda/ui/gui/*
 %{_datadir}/anaconda/pixmaps
@@ -466,4 +460,3 @@ rm -rf \
 %{_prefix}/lib/dracut/modules.d/80%{name}/*
 %{_prefix}/libexec/anaconda/dd_*
 
-%changelog