From 33004a37e5e3365523c799039429fbfe71c02a67 Mon Sep 17 00:00:00 2001
From: Aleš Matěj <amatej@redhat.com>
Date: Oct 14 2019 10:22:03 +0000
Subject: Update to 4.0.6


---

diff --git a/.gitignore b/.gitignore
index 18d8b12..31209e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /dnf-plugins-extras-4.0.2.tar.gz
 /dnf-plugins-extras-4.0.4.tar.gz
 /dnf-plugins-extras-4.0.5.tar.gz
+/dnf-plugins-extras-4.0.6.tar.gz
diff --git a/0002-system-upgrade-Check-not-None-before-setting-gpgcheck-options-RhBug17511031746346.patch b/0002-system-upgrade-Check-not-None-before-setting-gpgcheck-options-RhBug17511031746346.patch
deleted file mode 100644
index ffd67b9..0000000
--- a/0002-system-upgrade-Check-not-None-before-setting-gpgcheck-options-RhBug17511031746346.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b69ed80868f34d105bc9ec90ddf949ea5d7bc1de Mon Sep 17 00:00:00 2001
-From: Pavla Kratochvilova <pkratoch@redhat.com>
-Date: Tue, 24 Sep 2019 08:44:48 +0200
-Subject: [PATCH] [system-upgrade] Check not None before setting gpgcheck options (RhBug:1751103,1746346)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1751103
-https://bugzilla.redhat.com/show_bug.cgi?id=1746346
----
- plugins/system_upgrade.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py
-index 825202f..9bf3974 100644
---- a/plugins/system_upgrade.py
-+++ b/plugins/system_upgrade.py
-@@ -414,10 +414,14 @@ class SystemUpgradeCommand(dnf.cli.Command):
-         # use the saved value for --allowerasing, etc.
-         self.opts.distro_sync = self.state.distro_sync
-         self.cli.demands.allow_erasing = self.state.allow_erasing
--        self.base.conf.gpgcheck = self.state.gpgcheck
--        for repo in self.base.repos.values():
--            repo.gpgcheck = repo.id in self.state.gpgcheck_repos
--            repo.repo_gpgcheck = repo.id in self.state.repo_gpgcheck_repos
-+        if self.state.gpgcheck is not None:
-+            self.base.conf.gpgcheck = self.state.gpgcheck
-+        if self.state.gpgcheck_repos is not None:
-+            for repo in self.base.repos.values():
-+                repo.gpgcheck = repo.id in self.state.gpgcheck_repos
-+        if self.state.repo_gpgcheck_repos is not None:
-+            for repo in self.base.repos.values():
-+                repo.repo_gpgcheck = repo.id in self.state.repo_gpgcheck_repos
-         self.base.conf.best = self.state.best
-         if self.state.exclude is None:
-             self.state.exclude = []
---
-libgit2 0.28.2
-
diff --git a/dnf-plugins-extras.spec b/dnf-plugins-extras.spec
index 1e77b88..8174333 100644
--- a/dnf-plugins-extras.spec
+++ b/dnf-plugins-extras.spec
@@ -14,16 +14,14 @@
 %endif
 
 Name:           dnf-plugins-extras
-Version:        4.0.5
-Release:        3%{?dist}
+Version:        4.0.6
+Release:        1%{?dist}
 Summary:        Extras Plugins for DNF
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/%{name}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 # Newer rpmconf changed output, so the tests need to be adjusted
 Patch1:         0001-tests-Fix-expected-message-from-rpmconf.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1751103
-Patch2:         0002-system-upgrade-Check-not-None-before-setting-gpgcheck-options-RhBug17511031746346.patch
 
 BuildArch:      noarch
 BuildRequires:  cmake
@@ -447,6 +445,13 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitelib}/dnf-pl
 %endif
 
 %changelog
+* Mon Oct 14 2019 Ales Matej <amatej@redhat.com> - 4.0.6-1
+- [system-upgrade] Use --system-upgrade plymouth mode (RhBug:1681584)
+- [system-upgrade] Fix traceback caused by setting gpgcheck options (RhBug:1751103,1746346)
+- Fix kickstart plugin (RhBug:1649093)
+- [system-upgrade] Ensure identical transaction in download and update steps (RhBug:1758588)
+- [system-upgrade] Provide distro specific url for help with system-upgrade
+
 * Fri Sep 27 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 4.0.5-3
 - Backport patch to fix traceback in system-upgrade (RhBug:1751103,1746346)
 
diff --git a/sources b/sources
index e8becb0..3b0a82e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-plugins-extras-4.0.5.tar.gz) = dea407725811997e789acdcbcdc51852f077b8e84756ed5fe479eb580bb481eb6bbd9d9100b22bedd6a04910b7acbb4dec078c8271d75312531e3597e6fe7ee1
+SHA512 (dnf-plugins-extras-4.0.6.tar.gz) = 79eb40a4054f6dc8f93d55c14a024507687a6060bfef464ca246d3bd6155611f133520373510db6a36372296e0728bcefb68182b488aaf042fc0b282d935e4a8