diff --git a/backport-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch b/backport-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch deleted file mode 100644 index 7ac2341..0000000 --- a/backport-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 118bd0c124377dad1a01e7bbd3ec58fb6700714c Mon Sep 17 00:00:00 2001 -From: Jaroslav Rohel -Date: Wed, 20 Oct 2021 09:20:03 +0200 -Subject: [PATCH] Fix: Python dnf API does not respect cacheonly - (RhBug:1862970) - -`Repo` object has always been constructed with default synchronization -strategy. The configuration option `cacheonly` was ignored. DNF -application set synchronization strategy later in the `Cli` object -during processing demands. - -The fix takes into account the `cacheonly` option during the construction -of the `Repo` object. Synchronization strategy may still be overriden -during demand processing. - -Conflict: NA -Reference: https://github.com/rpm-software-management/dnf/commit/118bd0c124377dad1a01e7bbd3ec58fb6700714c ---- - dnf/repo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/repo.py b/dnf/repo.py -index bb422309d0..1822cf01ce 100644 ---- a/dnf/repo.py -+++ b/dnf/repo.py -@@ -434,7 +434,7 @@ def __init__(self, name=None, parent_conf=None): - self._pkgdir = None - self._key_import = _NullKeyImport() - self.metadata = None # :api -- self._repo.setSyncStrategy(self.DEFAULT_SYNC) -+ self._repo.setSyncStrategy(SYNC_ONLY_CACHE if parent_conf and parent_conf.cacheonly else self.DEFAULT_SYNC) - if parent_conf: - self._repo.setSubstitutions(parent_conf.substitutions) - self._substitutions = dnf.conf.substitutions.Substitutions() - diff --git a/backport-fix-dnf-mark-error-when-history-sqlite-missing.patch b/backport-fix-dnf-mark-error-when-history-sqlite-missing.patch deleted file mode 100644 index f8914e3..0000000 --- a/backport-fix-dnf-mark-error-when-history-sqlite-missing.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0fefe7c1ad1d9c60f6159b14871837043b5e0d1f Mon Sep 17 00:00:00 2001 -From: zhanghaolian <65838930+iWhy98@users.noreply.github.com> -Date: Tue, 25 Jan 2022 15:41:16 +0800 -Subject: [PATCH] dnf:fix dnf mark error when history sqlite missing - -Conflict:NA -Reference:https://github.com/rpm-software-management/dnf/pull/1808 - ---- - dnf/cli/commands/mark.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/cli/commands/mark.py b/dnf/cli/commands/mark.py -index ec16b73..cb1f91c 100644 ---- a/dnf/cli/commands/mark.py -+++ b/dnf/cli/commands/mark.py -@@ -89,7 +89,7 @@ class MarkCommand(commands.Command): - - old = self.base.history.last() - if old is None: -- rpmdb_version = self.sack._rpmdb_version() -+ rpmdb_version = self.base.sack._rpmdb_version() - else: - rpmdb_version = old.end_rpmdb_version - --- -2.27.0 - diff --git a/dnf-4.10.0.tar.gz b/dnf-4.10.0.tar.gz deleted file mode 100644 index 6767777..0000000 Binary files a/dnf-4.10.0.tar.gz and /dev/null differ diff --git a/dnf-4.14.0.tar.gz b/dnf-4.14.0.tar.gz new file mode 100644 index 0000000..c548819 Binary files /dev/null and b/dnf-4.14.0.tar.gz differ diff --git a/dnf.spec b/dnf.spec index 61ed9a6..296b9c6 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,9 +1,9 @@ %global py3pluginpath %{python3_sitelib}/%{name}-plugins -%global relate_libdnf_version 0.65.0 +%global relate_libdnf_version 0.66.0 Name: dnf -Version: 4.10.0 -Release: 8 +Version: 4.14.0 +Release: 1 Summary: A software package manager that manages packages on Linux distributions. License: GPLv2+ and GPLv2 and GPL URL: https://github.com/rpm-software-management/dnf @@ -15,8 +15,6 @@ Patch9002: add-rpm-transaction-debuginfo.patch Patch9003: adapt-test-another-process.patch Patch9004: fix-dnf-history-undo-error-when-history-sqlite-missing.patch -Patch6000: backport-fix-dnf-mark-error-when-history-sqlite-missing.patch -Patch6001: backport-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch %ifarch sw_64 Patch6002: dnf-4.10.0-sw.patch %endif @@ -51,11 +49,11 @@ It supports RPMs, modules and comps groups & environments. %package -n python3-%{name} Summary: Python 3 interface to DNF %{?python_provide:%python_provide python3-%{name}} -BuildRequires: python3-devel python3-hawkey >= 0.48.0 python3-libdnf >= 0.48.0 -BuildRequires: python3-libcomps >= 0.1.8 libmodulemd >= 1.4.0 +BuildRequires: python3-devel python3-hawkey >= 0.66.0 python3-libdnf >= 0.66.0 +BuildRequires: python3-libcomps >= 0.1.8 libmodulemd >= 2.9.3 BuildRequires: python3-gpg python3-rpm >= 4.14.0 -Requires: python3-gpg %{name}-data = %{version}-%{release} libmodulemd >= 1.4.0 -Requires: python3-hawkey >= 0.48.0 python3-libdnf >= %{relate_libdnf_version} +Requires: python3-gpg %{name}-data = %{version}-%{release} libmodulemd >= 2.9.3 +Requires: python3-hawkey >= 0.66.0 python3-libdnf >= %{relate_libdnf_version} Requires: python3-libcomps >= 0.1.8 python3-rpm >= 4.14.0 Recommends: python3-unbound Obsoletes: python2-%{name} @@ -231,6 +229,9 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %{_mandir}/man8/%{name}-automatic.8* %changelog +* Thu Nov 17 2022 chenhaixing - 4.14.0-1 +- DESC:upgrade dnf version to 4.14.0 + * Thu Jul 28 2022 wuzx - 4.10.0-8 - add sw64 patch