From 442771ac2145adcb3fe250f47c87ad202b264146 Mon Sep 17 00:00:00 2001 From: Anonymous_Z Date: Fri, 28 Feb 2020 14:05:03 +0800 Subject: [PATCH 1/2] fix update fail --- dnf-plugins-core.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 3b2221c..f607956 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -8,7 +8,7 @@ Name: dnf-plugins-core Version: 4.0.11 -Release: 3 +Release: 4 Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core @@ -44,6 +44,7 @@ Provides: dnf-utils = %{version}-%{release} Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} Conflicts: yum-utils < 1.1.31-520 yum-plugin-copr < 1.1.31-520 Obsoletes: dnf-utils < %{version}-%{release} +Obsoletes: python2-%{name} < %{version}-%{release} %description Core Plugins for DNF. This package enhances DNF with builddep, config-manager, @@ -245,6 +246,9 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/yum-copr.* %changelog +* Fri Feb 28 2020 zhangrui -4.0.11-4 +- fix fail in update + * Tue Feb 18 2020 zhangrui -4.0.11-3 - remove python2 -- Gitee From 03ac5968eab1b699a534788df49dac3faaa42dc4 Mon Sep 17 00:00:00 2001 From: Anonymous_Z Date: Fri, 28 Feb 2020 15:45:18 +0800 Subject: [PATCH 2/2] fix update fail --- dnf-plugins-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index f607956..cbf19d6 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -44,7 +44,6 @@ Provides: dnf-utils = %{version}-%{release} Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} Conflicts: yum-utils < 1.1.31-520 yum-plugin-copr < 1.1.31-520 Obsoletes: dnf-utils < %{version}-%{release} -Obsoletes: python2-%{name} < %{version}-%{release} %description Core Plugins for DNF. This package enhances DNF with builddep, config-manager, @@ -66,6 +65,7 @@ Obsoletes: python3-dnf-plugins-extras-debug < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra} +Obsoletes: python2-%{name} < %{version}-%{release} Conflicts: %{name} <= 0.1.5 python2-%{name} < %{version}-%{release} Conflicts: python-%{name} < %{version}-%{release} -- Gitee