From 5a71f9eb99b29234d70a9fa1d16a5923fb6a61f3 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Jul 20 2021 08:50:29 +0000
Subject: - Run installation tasks from ConfigureBootloaderWithTasks (vponcova)

  Related: rhbz#1977348
- Add the CollectConfigureBootloaderTasks method (vponcova)
  Related: rhbz#1977348
- Add the ConfigureBootloaderWithTasks method (vponcova)
  Resolves: rhbz#1977348
- Show suggestions for an error caused by inconsistent sector sizes (vponcova)
  Resolves: rhbz#1955514
- Configure the multilib policy of the target system (vponcova)
  Resolves: rhbz#1962026
- Enable the zram-generator service again (vponcova)
  Resolves: rhbz#1975881
- Enable NM autoconnections only if inst.ks and ip= is not used (rvykydal)
  Resolves: rhbz#1978264
- Disable NM autoconnections in Anaconda (rvykydal)
  Resolves: rhbz#1978264

---

diff --git a/.gitignore b/.gitignore
index 45961f9..061e1e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -291,3 +291,4 @@
 /anaconda-34.25.0.8.tar.bz2
 /anaconda-34.25.0.9.tar.bz2
 /anaconda-34.25.0.10.tar.bz2
+/anaconda-34.25.0.11.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index 429546d..fe68d08 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.25.0.10
+Version: 34.25.0.11
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -37,7 +37,7 @@ Source0: %{name}-%{version}.tar.bz2
 %define nmver 1.0
 %define pykickstartver 3.32.2-1
 %define pypartedver 2.5-2
-%define pythonblivetver 1:3.3.3-1
+%define pythonblivetver 1:3.4.0-1
 %define rpmver 4.10.0
 %define simplelinever 1.1-1
 %define subscriptionmanagerver 1.26
@@ -222,10 +222,7 @@ Requires: gdb
 Requires: rsync
 # only WeakRequires elsewhere and not guaranteed to be present
 Requires: device-mapper-multipath
-# FIXME: do not require on RHEL until the package is ready
-%if 0%{?rhel} != 9
-Requires: zram-generator-defaults
-%endif
+Requires: rust-zram-generator
 
 %description install-img-deps
 The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
@@ -338,6 +335,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/lib/systemd/system-generators/*
 %{_bindir}/instperf
 %{_bindir}/anaconda-disable-nm-ibft-plugin
+%{_bindir}/anaconda-nm-disable-autocons
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
@@ -407,6 +405,24 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Jul 20 2021 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.11-1
+- Run installation tasks from ConfigureBootloaderWithTasks (vponcova)
+  Related: rhbz#1977348
+- Add the CollectConfigureBootloaderTasks method (vponcova)
+  Related: rhbz#1977348
+- Add the ConfigureBootloaderWithTasks method (vponcova)
+  Resolves: rhbz#1977348
+- Show suggestions for an error caused by inconsistent sector sizes (vponcova)
+  Resolves: rhbz#1955514
+- Configure the multilib policy of the target system (vponcova)
+  Resolves: rhbz#1962026
+- Enable the zram-generator service again (vponcova)
+  Resolves: rhbz#1975881
+- Enable NM autoconnections only if inst.ks and ip= is not used (rvykydal)
+  Resolves: rhbz#1978264
+- Disable NM autoconnections in Anaconda (rvykydal)
+  Resolves: rhbz#1978264
+
 * Mon Jun 28 2021 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.10-1
 - Remove kickstart btrfs support (mkolman)
   Related: rhbz#1961087
diff --git a/sources b/sources
index 9059197..dc0a72b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.25.0.10.tar.bz2) = dfd1f46539a30232d7baaf0bb203cc7138ecce304a65f4d1cf3afb691dc41e67b534dbafe9aa1920a593548ee70490c17cb63d47337e5d32607bbb2bfbc945ad
+SHA512 (anaconda-34.25.0.11.tar.bz2) = dc1cde161b47840105bf020423de7fa997723e4bc5dfa46b781d55446e6c0c5188a70446a8e7fb467a00d9aff8254ab0758a2e496123579d31848783256d3faa