diff --git a/backport-Return-error-when-dnf-download-failed.patch b/backport-Return-error-when-dnf-download-failed.patch deleted file mode 100644 index 0d1a7286bf9d03b85f63c8359c2d7be3b7dc4df8..0000000000000000000000000000000000000000 --- a/backport-Return-error-when-dnf-download-failed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 86b479d618c6ec7cace7ba8f0e53e4a05cdb59d9 Mon Sep 17 00:00:00 2001 -From: zhangrui182 <55428730+zhangrui182@users.noreply.github.com> -Date: Wed, 15 Jul 2020 10:41:18 +0800 -Subject: [PATCH] return error when dnf download failed - -fix RhBug:1844925: https://bugzilla.redhat.com/show_bug.cgi?id=1844925 - -Conflict:NA -Reference:https://github.com/rpm-software-management/dnf-plugins-core/commit/86b479d618c6ec7cace7ba8f0e53e4a05cdb59d9 - ---- - plugins/download.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/download.py b/plugins/download.py -index c0fc213d..92a6df4a 100644 ---- a/plugins/download.py -+++ b/plugins/download.py -@@ -259,9 +259,9 @@ def _get_packages_with_deps(self, pkg_specs, source=False): - pkg_set.update(goal.list_upgrades()) - else: - msg = [_('Error in resolve of packages:')] -- logger.warning("\n ".join(msg + [str(pkg) for pkg in pkgs])) -- logger.warning(dnf.util._format_resolve_problems(goal.problem_rules())) -- return [] -+ logger.error("\n ".join(msg + [str(pkg) for pkg in pkgs])) -+ logger.error(dnf.util._format_resolve_problems(goal.problem_rules())) -+ raise dnf.exceptions.Error() - return pkg_set - - @staticmethod diff --git a/dnf-plugins-core-4.0.17.tar.gz b/dnf-plugins-core-4.0.17.tar.gz deleted file mode 100644 index 8d36edfc930d068c526355b18d485a111c1264f5..0000000000000000000000000000000000000000 Binary files a/dnf-plugins-core-4.0.17.tar.gz and /dev/null differ diff --git a/dnf-plugins-core-4.0.24.tar.gz b/dnf-plugins-core-4.0.24.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fc88340080d748eaa8421d61de67008dd7033454 Binary files /dev/null and b/dnf-plugins-core-4.0.24.tar.gz differ diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 1f401a38362fe03538c77769f2c88972e653089e..807644f4cc4f5593f838f4f31f09592a43d7e528 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -6,15 +6,13 @@ %bcond_without yumutils Name: dnf-plugins-core -Version: 4.0.17 -Release: 3 +Version: 4.0.24 +Release: 1 Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch6000: backport-Return-error-when-dnf-download-failed.patch - BuildArch: noarch BuildRequires: cmake gettext python3-sphinx Requires: python3-%{name} = %{version}-%{release} @@ -58,8 +56,10 @@ provides generate_completion_cache passive plugin. Summary: Core Plugins for DNF %{?python_provide:%python_provide python3-%{name}} BuildRequires: python3-devel python3-dnf >= %{dnf_lowest_compatible} python3-nose +BuildRequires: python3-dbus Requires: python3-distro python3-dnf >= %{dnf_lowest_compatible} Requires: python3-hawkey >= %{hawkey_version} python3-dateutil +Requires: python3-dbus Provides: python3-dnf-plugins-extras-debug = %{version}-%{release} Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release} Provides: python3-dnf-plugins-extras-repograph = %{version}-%{release} @@ -227,6 +227,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnf-plugins/debuginfo-install.py %{python3_sitelib}/dnf-plugins/download.py %{python3_sitelib}/dnf-plugins/generate_completion_cache.py +%{python3_sitelib}/dnf-plugins/groups_manager.py %{python3_sitelib}/dnf-plugins/needs_restarting.py %{python3_sitelib}/dnf-plugins/repoclosure.py %{python3_sitelib}/dnf-plugins/repodiff.py @@ -241,6 +242,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnf-plugins/__pycache__/debuginfo-install.* %{python3_sitelib}/dnf-plugins/__pycache__/download.* %{python3_sitelib}/dnf-plugins/__pycache__/generate_completion_cache.* +%{python3_sitelib}/dnf-plugins/__pycache__/groups_manager.* %{python3_sitelib}/dnf-plugins/__pycache__/needs_restarting.* %{python3_sitelib}/dnf-plugins/__pycache__/repoclosure.* %{python3_sitelib}/dnf-plugins/__pycache__/repodiff.* @@ -285,6 +287,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man1/yum-config-manager.* %{_mandir}/man1/yum-debug-dump.* %{_mandir}/man1/yum-debug-restore.* +%{_mandir}/man1/yum-groups-manager.* %{_mandir}/man1/yumdownloader.* %{_mandir}/man1/package-cleanup.* %{_mandir}/man1/dnf-utils.* @@ -303,6 +306,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf-debuginfo-install.* %{_mandir}/man8/dnf-download.* %{_mandir}/man8/dnf-generate_completion_cache.* +%{_mandir}/man8/dnf-groups-manager.* %{_mandir}/man8/dnf-needs-restarting.* %{_mandir}/man8/dnf-repoclosure.* %{_mandir}/man8/dnf-repodiff.* @@ -317,6 +321,9 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf-local.* %changelog +* Tue Nov 23 2021 hanhui - 4.0.24-1 +- DESC:update to 4.0.24 + * Thu Jul 20 2021 liuyumeng - 4.0.17-3 - delete gdb in buildrequires