From bc97d81a50133316c4ffb3a1906afde529a677bb Mon Sep 17 00:00:00 2001
From: Jan Kolarik <jkolarik@redhat.com>
Date: Wed, 24 Apr 2024 14:22:25 +0200
Subject: [PATCH] Update to 4.20.0

Resolves: RHEL-26646
Resolves: RHEL-37552
Resolves: RHEL-38831
---
 .gitignore |  1 +
 dnf.spec   | 36 +++++++++++++++++++++++++++++++++---
 sources    |  2 +-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6310f09..3cbca89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@
 /dnf-4.19.0.tar.gz
 /dnf-4.19.1.tar.gz
 /dnf-4.19.2.tar.gz
+/dnf-4.20.0.tar.gz
diff --git a/dnf.spec b/dnf.spec
index cc9b4f1..c03a7ff 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -8,11 +8,11 @@
 %global rpm_version 4.14.0
 
 # conflicts
-%global conflicts_dnf_plugins_core_version 4.0.26
+%global conflicts_dnf_plugins_core_version 4.7.0
 %global conflicts_dnf_plugins_extras_version 4.0.4
 %global conflicts_dnfdaemon_version 0.3.19
 
-%bcond dnf5_obsoletes_dnf %[0%{?fedora} > 41 || 0%{?rhel} > 11]
+%bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 11]
 
 # override dependencies for rhel 7
 %if 0%{?rhel} == 7
@@ -67,7 +67,7 @@
 It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
-Version:        4.19.2
+Version:        4.20.0
 Release:        1%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
@@ -226,6 +226,11 @@ ln -sr %{buildroot}%{_bindir}/dnf-3 %{buildroot}%{_bindir}/dnf
 ln -sr %{buildroot}%{_bindir}/dnf-3 %{buildroot}%{_bindir}/dnf4
 ln -sr %{buildroot}%{_datadir}/bash-completion/completions/dnf-3 %{buildroot}%{_datadir}/bash-completion/completions/dnf4
 ln -sr %{buildroot}%{_datadir}/bash-completion/completions/dnf-3 %{buildroot}%{_datadir}/bash-completion/completions/dnf
+for file in %{buildroot}%{_mandir}/man[578]/dnf4[-.]*; do
+    dir=$(dirname $file)
+    filename=$(basename $file)
+    ln -sr $file $dir/${filename/dnf4/dnf}
+done
 mv %{buildroot}%{_bindir}/dnf-automatic-3 %{buildroot}%{_bindir}/dnf-automatic
 rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 
@@ -253,6 +258,17 @@ ln -sr  %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
 
 %if %{with dnf5_obsoletes_dnf}
 rm %{buildroot}%{confdir}/%{name}.conf
+rm %{buildroot}%{_mandir}/man5/%{name}.conf.5*
+%endif
+
+%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
+# Don't add -P to Python shebangs
+# The executable Python scripts import each other
+%undefine _py3_shebang_P
+
+%py3_shebang_fix %{buildroot}%{_bindir}/dnf-3
+%py3_shebang_fix %{buildroot}%{_bindir}/dnf-automatic
+%py3_shebang_fix %{buildroot}%{python3_sitelib}/%{name}/cli/completion_helper.py
 %endif
 
 %check
@@ -324,7 +340,10 @@ popd
 %ghost %attr(644,-,-) %{_sharedstatedir}/%{name}/groups.json
 %ghost %attr(755,-,-) %dir %{_sharedstatedir}/%{name}/yumdb
 %ghost %attr(755,-,-) %dir %{_sharedstatedir}/%{name}/history
+%{_mandir}/man5/%{name}4.conf.5*
+%if %{without dnf5_obsoletes_dnf}
 %{_mandir}/man5/%{name}.conf.5*
+%endif
 %{_tmpfilesdir}/%{name}.conf
 %{_sysconfdir}/libreport/events.d/collect_dnf.conf
 
@@ -378,6 +397,9 @@ popd
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}-3
 %{_datadir}/bash-completion/completions/%{name}4
+%{_mandir}/man8/%{name}4.8*
+%{_mandir}/man7/dnf4.modularity.7*
+%{_mandir}/man5/dnf4-transaction-json.5*
 %exclude %{python3_sitelib}/%{name}/automatic
 %{python3_sitelib}/%{name}-*.dist-info
 %{python3_sitelib}/%{name}/
@@ -399,6 +421,14 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Wed Apr 24 2024 Jan Kolarik <jkolarik@redhat.com> - 4.20.0-1
+- Update to 4.20.0 (RHEL-38831)
+- repoquery: Fix loading filelists when -f is used (RhBug:2276012)
+- remove: --duplicates and --oldinstallonly exit with 0 when nothing to do (RHEL-37552)
+- spec: Do not add user site-packages directory to sys.path (RHEL-26646)
+- man: Prepare pages for dnf5 switch
+- spec: Prepare for switch of dnf5 in Rawhide
+
 * Fri Mar 29 2024 Evan Goode <mail@evangoo.de> - 4.19.2-1
 - Update to 4.19.2 (RHEL-38831)
 - Bump libdnf requirement to 0.73.1
diff --git a/sources b/sources
index f35d590..dcf309d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-4.19.2.tar.gz) = d44231676e3332a0d6b3900aebd5566f69eaad5a3fb7fa3f1dfe7fbeabfdd39de099ccf097ad78fbbea81b3bb3a4d33f513d3741e7bf52797d56c2b3d0930582
+SHA512 (dnf-4.20.0.tar.gz) = 00c1fadaabc31bf757e49381261d54e3f88928fee77897d3c77461b1391a868ecb5fbbd6194cb70b7f82d0c93bbc1148580284ae0c9d4795fc770e0ebcbf5423