From 74b214809dc86fd583692de1fe3ece83b1b94f6e Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Mon, 8 Feb 2021 19:41:52 +0100
Subject: [PATCH] New version 34.24-1

- Modify spec file to add patches required on rhel-9 rebuild (#1907566)
  (jkonecny)
- Unify GRUB configuration file location across all platforms (javierm)
- Do not use redirector for rawhide repository for iso building on PR
  (rvykydal)
- Move finding flatpak size to a task (vslavik)
- Move flatpak installation code to a task (vslavik)
- Move and rename FlatpakPayload (vslavik)
- Abort with a message on invalid host name in kickstart (vslavik)
- Use redirector for rawhide repository for iso building on PR (rvykydal)
- Add tests for the inst. prefix requirement (#1912502) (jkonecny)
- Do not support no inst. Anaconda boot args in systemd services (#1912502)
  (jkonecny)
- Remove check to avoid process of help and version boot args (#1912502)
  (jkonecny)
- Remove Anaconda boot arguments without inst. prefix from stage2 (#1912502)
  (jkonecny)
- Add support for non-critical installation errors (vponcova)
- Don't run a canceled task (vponcova)
- Fix exclude arguments of tar payload extracting. (rvykydal)
- Remove support for boot arguments without 'inst.' prefix from Dracut
  (#1912502) (jkonecny)
- Cache flatpak size instead of persistent instance (vslavik)
---
 .gitignore    |  1 +
 anaconda.spec | 38 +++++++++++++++++++++++++++++++++++++-
 sources       |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b56f859..dc80215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,3 +272,4 @@
 /anaconda-34.21.tar.bz2
 /anaconda-34.22.tar.bz2
 /anaconda-34.23.tar.bz2
+/anaconda-34.24.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index 191d5e7..473a89d 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.23
+Version: 34.24
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -12,6 +12,17 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+# TODO: Remove this as soon as rhbz#1907566 will be solved!
+# These patches will disable requirement of inst. prefix for RHEL-9.
+# We need these to avoid beaker breakage see rhbz#1907566 for more info.
+# Patches are generated from last three commits on:
+# https://github.com/jkonecny12/anaconda/tree/master-add-patches-to-allow-no-inst-prefix
+%if 0%{?rhel} == 9
+Patch0: 0001-Revert-Remove-support-for-boot-arguments-without-ins.patch
+Patch1: 0002-Revert-Do-not-support-no-inst.-Anaconda-boot-args-in.patch
+Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch
+%endif
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -409,6 +420,31 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Feb 08 2021 Martin Kolman <mkolman@redhat.com> - 34.24-1
+- Modify spec file to add patches required on rhel-9 rebuild (#1907566)
+  (jkonecny)
+- Unify GRUB configuration file location across all platforms (javierm)
+- Do not use redirector for rawhide repository for iso building on PR
+  (rvykydal)
+- Move finding flatpak size to a task (vslavik)
+- Move flatpak installation code to a task (vslavik)
+- Move and rename FlatpakPayload (vslavik)
+- Abort with a message on invalid host name in kickstart (vslavik)
+- Use redirector for rawhide repository for iso building on PR (rvykydal)
+- Add tests for the inst. prefix requirement (#1912502) (jkonecny)
+- Do not support no inst. Anaconda boot args in systemd services (#1912502)
+  (jkonecny)
+- Remove check to avoid process of help and version boot args (#1912502)
+  (jkonecny)
+- Remove Anaconda boot arguments without inst. prefix from stage2 (#1912502)
+  (jkonecny)
+- Add support for non-critical installation errors (vponcova)
+- Don't run a canceled task (vponcova)
+- Fix exclude arguments of tar payload extracting. (rvykydal)
+- Remove support for boot arguments without 'inst.' prefix from Dracut
+  (#1912502) (jkonecny)
+- Cache flatpak size instead of persistent instance (vslavik)
+
 * Fri Feb 05 2021 Martin Kolman <mkolman@redhat.com> - 34.23-1
 - Add a metapackage for image (boot.iso) dependencies (vslavik)
 - Take dnf substitutions from installer environment configuration (rvykydal)
diff --git a/sources b/sources
index e723fbd..24ae731 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.23.tar.bz2) = f938525d1f05e7fde4b50f08469f822225277f4326135488f2e9ec4938a0a33b8d514f8dbf8919debc251797660600b942f081b7d087eb6a4d308dd979d1e90d
+SHA512 (anaconda-34.24.tar.bz2) = 5a5b240debf0b45ab7471ad8639bc634741582fd4e86fd8cea8ff516ee9cf90fe35f0193c2383306ad68125569d80a7968017092b36979f240026b15eddf2276