!19 [sync] PR-17: 修复升级时报错文件冲突问题

From: @openeuler-sync-bot 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2022-06-21 01:16:46 +00:00 committed by Gitee
commit 4bb408f735
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -3,7 +3,7 @@ Python classes to extract information from the Linux kernel /proc files.
Name: python-linux-procfs Name: python-linux-procfs
Version: 0.6.3 Version: 0.6.3
Release: 1 Release: 2
Summary: Linux /proc abstraction classes Summary: Linux /proc abstraction classes
License: GPLv2 License: GPLv2
URL: https://rt.wiki.kernel.org/index.php/Tuna URL: https://rt.wiki.kernel.org/index.php/Tuna
@ -17,6 +17,7 @@ BuildRequires: python3-devel python3-setuptools
Summary: %summary Summary: %summary
%{?python_provide:%python_provide python3-linux-procfs} %{?python_provide:%python_provide python3-linux-procfs}
Requires: python3-six Requires: python3-six
Obsoletes: python2-linux-procfs
%description -n python3-linux-procfs %_description %description -n python3-linux-procfs %_description
@ -38,6 +39,9 @@ Requires: python3-six
%license COPYING %license COPYING
%changelog %changelog
* Mon Jun 20 2022 shixuantong <shixuantong@h-partners.com> - 0.6.3-2
- fix file conflict
* Wed Nov 24 2021 liudabo <liudabo1@huawei.com> - 0.6.3-1 * Wed Nov 24 2021 liudabo <liudabo1@huawei.com> - 0.6.3-1
- upgrade version to 0.6.3 - upgrade version to 0.6.3