upgrade dnf version to 4.14.0

This commit is contained in:
chenhaixing 2022-11-03 15:20:45 +08:00
parent 69202668e6
commit 421d1a4b37
4 changed files with 11 additions and 36 deletions

View File

@ -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

Binary file not shown.

BIN
dnf-4.14.0.tar.gz Normal file

Binary file not shown.

View File

@ -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: 3
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,7 +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
BuildArch: noarch
BuildRequires: cmake gettext systemd bash-completion python3-sphinx
@ -47,11 +46,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}
@ -124,6 +123,7 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/plugins %{buildroot}%{_sysconfdir}/yu
ln -sr %{buildroot}%{_sysconfdir}/%{name}/protected.d %{buildroot}%{_sysconfdir}/yum/protected.d
ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/vars
%post
%systemd_post dnf-makecache.timer
%systemd_post dnf-automatic.timer
@ -225,6 +225,9 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v
%{_mandir}/man8/%{name}-automatic.8*
%changelog
* Thu Nov 3 2022 chenhaixing <chenhaixing@huawei.com> - 4.14.0-1
- DESC:upgrade dnf version to 4.14.0
* Mon Mar 21 2022 yangcheng <yangcheng87@h-partners.com> - 4.10.0-3
- Type:bugfix
- ID:NA