From c04f0c032fb2cc3d8f43a20e31efd7ea7e8ebd70 Mon Sep 17 00:00:00 2001 From: shixuantong <1726671442@qq.com> Date: Mon, 20 Jun 2022 15:49:07 +0800 Subject: [PATCH] fix file conflict (cherry picked from commit 82f45ce7cabd581c2ffca4360a3be6a175a8d81c) --- python-linux-procfs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-linux-procfs.spec b/python-linux-procfs.spec index 8221020..ae17fcd 100644 --- a/python-linux-procfs.spec +++ b/python-linux-procfs.spec @@ -3,7 +3,7 @@ Python classes to extract information from the Linux kernel /proc files. Name: python-linux-procfs Version: 0.6.3 -Release: 1 +Release: 2 Summary: Linux /proc abstraction classes License: GPLv2 URL: https://rt.wiki.kernel.org/index.php/Tuna @@ -17,6 +17,7 @@ BuildRequires: python3-devel python3-setuptools Summary: %summary %{?python_provide:%python_provide python3-linux-procfs} Requires: python3-six +Obsoletes: python2-linux-procfs %description -n python3-linux-procfs %_description @@ -38,6 +39,9 @@ Requires: python3-six %license COPYING %changelog +* Mon Jun 20 2022 shixuantong - 0.6.3-2 +- fix file conflict + * Wed Nov 24 2021 liudabo - 0.6.3-1 - upgrade version to 0.6.3 -- Gitee