From 44b006f83c775541c793aceb22ba9d6ce72f9a68 Mon Sep 17 00:00:00 2001
From: Jan Kolarik <jkolarik@redhat.com>
Date: Tue, 30 May 2023 08:35:46 +0200
Subject: [PATCH] Update to 4.16.1

---
 .gitignore |  1 +
 dnf.spec   | 64 ++++++++++++++++++++++++++++++++++--------------------
 sources    |  2 +-
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index feadbd2..27630c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,4 @@
 /dnf-4.15.0.tar.gz
 /dnf-4.15.1.tar.gz
 /dnf-4.16.0.tar.gz
+/dnf-4.16.1.tar.gz
diff --git a/dnf.spec b/dnf.spec
index 3558533..522222b 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -65,7 +65,7 @@
 It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
-Version:        4.16.0
+Version:        4.16.1
 Release:        1%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
@@ -86,29 +86,6 @@ Requires:       %{_bindir}/sqlite3
 %else
 Recommends:     (python3-dbus if NetworkManager)
 %endif
-Provides:       dnf-command(alias)
-Provides:       dnf-command(autoremove)
-Provides:       dnf-command(check-update)
-Provides:       dnf-command(clean)
-Provides:       dnf-command(distro-sync)
-Provides:       dnf-command(downgrade)
-Provides:       dnf-command(group)
-Provides:       dnf-command(history)
-Provides:       dnf-command(info)
-Provides:       dnf-command(install)
-Provides:       dnf-command(list)
-Provides:       dnf-command(makecache)
-Provides:       dnf-command(mark)
-Provides:       dnf-command(provides)
-Provides:       dnf-command(reinstall)
-Provides:       dnf-command(remove)
-Provides:       dnf-command(repolist)
-Provides:       dnf-command(repoquery)
-Provides:       dnf-command(repository-packages)
-Provides:       dnf-command(search)
-Provides:       dnf-command(updateinfo)
-Provides:       dnf-command(upgrade)
-Provides:       dnf-command(upgrade-to)
 Conflicts:      python3-dnf-plugins-core < %{conflicts_dnf_plugins_core_version}
 Conflicts:      python3-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extras_version}
 
@@ -118,7 +95,9 @@ Conflicts:      python3-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extr
 %package data
 Summary:        Common data and configuration files for DNF
 Requires:       libreport-filesystem
+%if 0%{?fedora} > 38
 Requires:       libdnf5
+%endif
 Obsoletes:      %{name}-conf <= %{version}-%{release}
 Provides:       %{name}-conf = %{version}-%{release}
 
@@ -168,6 +147,29 @@ Requires:       rpm-plugin-systemd-inhibit
 %else
 Recommends:     (rpm-plugin-systemd-inhibit if systemd)
 %endif
+Provides:       dnf-command(alias)
+Provides:       dnf-command(autoremove)
+Provides:       dnf-command(check-update)
+Provides:       dnf-command(clean)
+Provides:       dnf-command(distro-sync)
+Provides:       dnf-command(downgrade)
+Provides:       dnf-command(group)
+Provides:       dnf-command(history)
+Provides:       dnf-command(info)
+Provides:       dnf-command(install)
+Provides:       dnf-command(list)
+Provides:       dnf-command(makecache)
+Provides:       dnf-command(mark)
+Provides:       dnf-command(provides)
+Provides:       dnf-command(reinstall)
+Provides:       dnf-command(remove)
+Provides:       dnf-command(repolist)
+Provides:       dnf-command(repoquery)
+Provides:       dnf-command(repository-packages)
+Provides:       dnf-command(search)
+Provides:       dnf-command(updateinfo)
+Provides:       dnf-command(upgrade)
+Provides:       dnf-command(upgrade-to)
 
 %description -n python3-%{name}
 Python 3 interface to DNF.
@@ -232,6 +234,9 @@ ln -sr  %{buildroot}%{confdir}/protected.d %{buildroot}%{_sysconfdir}/yum/protec
 ln -sr  %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
 %endif
 
+%if 0%{?fedora} > 38
+rm %{buildroot}%{confdir}/%{name}.conf
+%endif
 
 %check
 
@@ -284,8 +289,15 @@ popd
 %dir %{confdir}/modules.d
 %dir %{confdir}/modules.defaults.d
 %dir %{pluginconfpath}
+%if 0%{?fedora} <= 38
+%dir %{confdir}/protected.d
+%dir %{confdir}/vars
+%endif
 %dir %{confdir}/aliases.d
 %exclude %{confdir}/aliases.d/zypper.conf
+%if 0%{?fedora} <= 38
+%config(noreplace) %{confdir}/%{name}.conf
+%endif
 # No longer using `noreplace` here. Older versions of DNF 4 marked `dnf` as a
 # protected package, but since Fedora 39, DNF needs to be able to update itself
 # to DNF 5, so we need to replace the old /etc/dnf/protected.d/dnf.conf.
@@ -365,6 +377,10 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Mon May 29 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.1-1
+- Update to 4.16.1
+- DNF5 should not deprecate DNF on Fedora 38
+
 * Thu May 25 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.0-1
 - Update to 4.16.0
 - Remove ownership of dnf.conf, protected.d, vars
diff --git a/sources b/sources
index a0db970..3420252 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-4.16.0.tar.gz) = bfebb358b6d49e898a5a1dd4395e35869b317c8a7bc82bde463d859c2cfe3fc8c7c9f21b99dbd381dde0a0a689fc278a32cb9c39784a990a71dcdd86c7d2225e
+SHA512 (dnf-4.16.1.tar.gz) = b478b0ff851333591f4bb42b01a344377ee14ffd892e1897b59ecd34c08042d9366b97c0c50175b6744726d2e29476a208545b5c4b6e7188acfd7e5e26d33161