Compare commits

..

No commits in common. "26bba31b88c553d0bc6c4df1c78ec5877a24623d" and "a5b0b68623010bfcdf733450a0e0bdafb7a257af" have entirely different histories.

5 changed files with 10 additions and 124 deletions

View File

@ -1,24 +0,0 @@
From 7b53194f09c229e36fdc9d39556638c21c130dfa Mon Sep 17 00:00:00 2001
From: wangyueliang <wangyueliang@kylinos.cn>
Date: Wed, 8 May 2024 16:29:26 +0800
Subject: [PATCH] Replace COPR hub with openeuler
---
etc/dnf/plugins/copr.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/dnf/plugins/copr.conf b/etc/dnf/plugins/copr.conf
index bc29926..5d188c1 100644
--- a/etc/dnf/plugins/copr.conf
+++ b/etc/dnf/plugins/copr.conf
@@ -1,5 +1,5 @@
-[fedora]
-hostname = copr.fedorainfracloud.org
+[openeuler]
+hostname = eur.openeuler.openatom.cn
protocol = https
port = 443
--
2.33.0

View File

@ -1,31 +0,0 @@
From 95ff945cd92a8c8299874fe8007951f0d158113a Mon Sep 17 00:00:00 2001
From: Michal Gawlik <michal@gawlik.dev>
Date: Fri, 16 Sep 2022 13:09:18 +0200
Subject: [PATCH] download plugin: respect install_weak_deps option value
Do not download weak deps when install_weak_deps is set to False.
= changelog =
msg: download: skip downloading weak deps when install_weak_deps=False
type: bug
Reference:https://github.com/rpm-software-management/dnf-plugins-core/commit/95ff945cd92a8c8299874fe8007951f0d158113a
Conflict:NA
---
plugins/download.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/download.py b/plugins/download.py
index 92a6df4a..d8ce4bec 100644
--- a/plugins/download.py
+++ b/plugins/download.py
@@ -253,7 +253,7 @@ def _get_packages_with_deps(self, pkg_specs, source=False):
for pkg in pkgs:
goal = hawkey.Goal(self.base.sack)
goal.install(pkg)
- rc = goal.run()
+ rc = goal.run(ignore_weak_deps=(not self.base.conf.install_weak_deps))
if rc:
pkg_set.update(goal.list_installs())
pkg_set.update(goal.list_upgrades())
--

Binary file not shown.

Binary file not shown.

View File

@ -1,22 +1,18 @@
%global dnf_lowest_compatible 4.11.0 %global dnf_lowest_compatible 4.2.22
%global dnf_plugins_extra 2.0.0 %global dnf_plugins_extra 2.0.0
%global hawkey_version 0.64.0 %global hawkey_version 0.46.1
%bcond_without yumcompatibility %bcond_without yumcompatibility
%bcond_without yumutils %bcond_without yumutils
Name: dnf-plugins-core Name: dnf-plugins-core
Version: 4.3.1 Version: 4.0.24
Release: 4 Release: 1
Summary: Core Plugins for DNF Summary: Core Plugins for DNF
License: GPLv2+ License: GPLv2+
URL: https://github.com/rpm-software-management/dnf-plugins-core URL: https://github.com/rpm-software-management/dnf-plugins-core
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
patch6000: backport-download-plugin-respect-install_weak_deps-option-value.patch
patch9000: 9000-Replace-COPR-hub-with-openeuler.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: cmake gettext python3-sphinx BuildRequires: cmake gettext python3-sphinx
Requires: python3-%{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release}
@ -26,8 +22,7 @@ Provides: dnf-command(builddep) dnf-command(changelog) dnf-command(
Provides: dnf-command(copr) dnf-command(debug-dump) dnf-command(debug-restore) Provides: dnf-command(copr) dnf-command(debug-dump) dnf-command(debug-restore)
Provides: dnf-command(debuginfo-install) dnf-command(download) dnf-command(repoclosure) Provides: dnf-command(debuginfo-install) dnf-command(download) dnf-command(repoclosure)
Provides: dnf-command(repograph) dnf-command(repomanage) dnf-command(reposync) Provides: dnf-command(repograph) dnf-command(repomanage) dnf-command(reposync)
Provides: dnf-command(repodiff) dnf-command(groups-manager) Provides: dnf-command(repodiff) dnf-plugins-extras-debug = %{version}-%{release}
Provides: dnf-plugins-extras-debug = %{version}-%{release}
Provides: dnf-plugins-extras-repoclosure = %{version}-%{release} Provides: dnf-plugins-extras-repoclosure = %{version}-%{release}
Provides: dnf-plugins-extras-repograph = %{version}-%{release} Provides: dnf-plugins-extras-repograph = %{version}-%{release}
Provides: dnf-plugins-extras-repomanage = %{version}-%{release} Provides: dnf-plugins-extras-repomanage = %{version}-%{release}
@ -37,7 +32,6 @@ Provides: dnf-plugin-debuginfo-install = %{version}-%{release}
Provides: dnf-plugin-download = %{version}-%{release} Provides: dnf-plugin-download = %{version}-%{release}
Provides: dnf-plugin-generate_completion_cache = %{version}-%{release} Provides: dnf-plugin-generate_completion_cache = %{version}-%{release}
Provides: dnf-plugin-needs_restarting = %{version}-%{release} Provides: dnf-plugin-needs_restarting = %{version}-%{release}
Provides: dnf-plugin-groups-manager = %{version}-%{release}
Provides: dnf-plugin-repoclosure = %{version}-%{release} Provides: dnf-plugin-repoclosure = %{version}-%{release}
Provides: dnf-plugin-repodiff = %{version}-%{release} Provides: dnf-plugin-repodiff = %{version}-%{release}
Provides: dnf-plugin-repograph = %{version}-%{release} Provides: dnf-plugin-repograph = %{version}-%{release}
@ -50,18 +44,18 @@ Provides: dnf-utils = %{version}-%{release}
Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra}
Conflicts: yum-utils < 1.1.31-520 yum-plugin-copr < 1.1.31-520 Conflicts: yum-utils < 1.1.31-520 yum-plugin-copr < 1.1.31-520
Obsoletes: dnf-utils < %{version}-%{release} Obsoletes: dnf-utils < %{version}-%{release}
Obsoletes: python2-dnf-plugin-migrate < %{version}-%{release} Obsoletes: python2-dnf-plugin-migrate < %{version}-%{release}
%description %description
Core Plugins for DNF. This package enhances DNF with builddep, config-manager, Core Plugins for DNF. This package enhances DNF with builddep, config-manager,
copr, debug, debuginfo-install, download, needs-restarting, groups-manager, repoclosure, copr, debug, debuginfo-install, download, needs-restarting, repoclosure,
repograph, repomanage, reposync, changelog and repodiff commands. Additionally repograph, repomanage, reposync, changelog and repodiff commands. Additionally
provides generate_completion_cache passive plugin. provides generate_completion_cache passive plugin.
%package -n python3-%{name} %package -n python3-%{name}
Summary: Core Plugins for DNF Summary: Core Plugins for DNF
%{?python_provide:%python_provide python3-%{name}} %{?python_provide:%python_provide python3-%{name}}
BuildRequires: python3-devel python3-dnf >= %{dnf_lowest_compatible} BuildRequires: python3-devel python3-dnf >= %{dnf_lowest_compatible} python3-nose
BuildRequires: python3-dbus BuildRequires: python3-dbus
Requires: python3-distro python3-dnf >= %{dnf_lowest_compatible} Requires: python3-distro python3-dnf >= %{dnf_lowest_compatible}
Requires: python3-hawkey >= %{hawkey_version} python3-dateutil Requires: python3-hawkey >= %{hawkey_version} python3-dateutil
@ -154,18 +148,6 @@ Obsoletes: python3-dnf-plugins-extras-local < %{dnf_plugins_extra}
Local Plugin for DNF, Python 3 version. Automatically copy all downloaded packages to a repository Local Plugin for DNF, Python 3 version. Automatically copy all downloaded packages to a repository
on the local filesystem and generating repo metadata. on the local filesystem and generating repo metadata.
%package -n python3-dnf-plugin-modulesync
Summary: Download module metadata and package and create repository
Requires: python3-%{name} = %{version}-%{release}
Requires: createrepo_c >= 0.17.4
Provides: dnf-plugin-modulesync = %{version}-%{release}
Provides: dnf-command(modulesync)
%description -n python3-dnf-plugin-modulesync
Download module metadata from all enabled repositories, module artifacts and profiles of matching
modules and create repository.
%package_help %package_help
%prep %prep
@ -209,9 +191,7 @@ ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
%check %check
pushd build-py3 PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
ctest -VV
popd
%files %files
%{_libexecdir}/dnf-utils %{_libexecdir}/dnf-utils
@ -279,7 +259,6 @@ popd
%files -n python3-dnf-plugin-post-transaction-actions %files -n python3-dnf-plugin-post-transaction-actions
%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.conf %config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.conf
%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.d
%{python3_sitelib}/dnf-plugins/post-transaction-actions.* %{python3_sitelib}/dnf-plugins/post-transaction-actions.*
%{python3_sitelib}/dnf-plugins/__pycache__/post-transaction-actions.* %{python3_sitelib}/dnf-plugins/__pycache__/post-transaction-actions.*
@ -296,11 +275,6 @@ popd
%{python3_sitelib}/dnf-plugins/local.* %{python3_sitelib}/dnf-plugins/local.*
%{python3_sitelib}/dnf-plugins/__pycache__/local.* %{python3_sitelib}/dnf-plugins/__pycache__/local.*
%files -n python3-dnf-plugin-modulesync
%{python3_sitelib}/dnf-plugins/modulesync.*
%{python3_sitelib}/dnf-plugins/__pycache__/modulesync.*
%{_mandir}/man8/dnf-modulesync.*
%files help %files help
%{_mandir}/man1/debuginfo-install.* %{_mandir}/man1/debuginfo-install.*
%{_mandir}/man1/needs-restarting.* %{_mandir}/man1/needs-restarting.*
@ -347,43 +321,10 @@ popd
%{_mandir}/man8/dnf-local.* %{_mandir}/man8/dnf-local.*
%changelog %changelog
* Wed May 8 2024 wangyueliang <wangyueliang@kylinos.cn> - 4.3.1-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Replace COPR hub with openeuler
* Tue Jun 27 2023 chenhaixing <chenhaixing@huawei.com> - 4.3.1-3
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:dnf-plugins-core:download plugin:respect install_weak_deps option value
* Thu Dec 1 2022 chenhaixing <chenhaixing@huawei.com> - 4.3.1-2
- DESC:modify incorrect contents in spec file
* Thu Nov 3 2022 chenhaixing <chenhaixing@huawei.com> - 4.3.1-1
- DESC:upgrade dnf-plugins-core version to 4.3.1
* Mon Aug 22 2022 chenhaixing <chenhaixing@huawei.com> - 4.0.24-5
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:add configfile post-transaction-actions.d
* Thu May 26 2022 wangkerong<wangkerong@h-partners.com> - 4.0.24-4
- DESC: Remove redundant BuildRequires
* Sat Jan 22 2022 hanhui<hanhui15@huawei.com> - 4.0.24-3
- DESC:Reposync does not stop downloading packages
* Fri Jan 7 2022 wangkerong<wangkerong@huawei.com> - 4.0.24-2
- DESC:delete buildrequires of python-nose
* Tue Nov 23 2021 hanhui<hanhui15@huawei.com> - 4.0.24-1 * Tue Nov 23 2021 hanhui<hanhui15@huawei.com> - 4.0.24-1
- DESC:update to 4.0.24 - DESC:update to 4.0.24
* Tue Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 4.0.17-3 * Thu Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 4.0.17-3
- delete gdb in buildrequires - delete gdb in buildrequires
* Fri Apr 16 2021 hanhui <hanhui15@huawei.com> - 4.0.17-2 * Fri Apr 16 2021 hanhui <hanhui15@huawei.com> - 4.0.17-2