From ae6d84fe5213578e7e85e0fcb807912b10c10f0e Mon Sep 17 00:00:00 2001 From: zhang-liang-pengkun Date: Thu, 22 Feb 2024 15:01:04 +0800 Subject: [PATCH] Remove redundant patches Signed-off-by: zhang-liang-pengkun --- ...compatibility-with-python-2.6.x-1216.patch | 25 ------------------- python-psutil.spec | 5 +++- 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 0004-fix-compatibility-with-python-2.6.x-1216.patch diff --git a/0004-fix-compatibility-with-python-2.6.x-1216.patch b/0004-fix-compatibility-with-python-2.6.x-1216.patch deleted file mode 100644 index d399974..0000000 --- a/0004-fix-compatibility-with-python-2.6.x-1216.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7618de9683684811402f50b08ca3f3e979774e72 Mon Sep 17 00:00:00 2001 -From: Dan Vinakovsky -Date: Mon, 12 Feb 2018 18:29:34 -0500 -Subject: [PATCH] fix compatibility with python 2.6.x (#1216) - ---- - psutil/_pswindows.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py -index b6c58c93..0eb4b14f 100644 ---- a/psutil/_pswindows.py -+++ b/psutil/_pswindows.py -@@ -200,7 +200,7 @@ def py2_strencode(s): - if isinstance(s, str): - return s - else: -- return s.encode(ENCODING, errors=ENCODING_ERRS) -+ return s.encode(ENCODING, ENCODING_ERRS) - - - # ===================================================================== --- -2.39.0.windows.2 - diff --git a/python-psutil.spec b/python-psutil.spec index f620229..0d1696a 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -1,6 +1,6 @@ Name: python-psutil Version: 5.4.3 -Release: 13 +Release: 14 Summary: A library for retrieving information on running processes and system utilization in Python License: BSD URL: https://github.com/giampaolo/psutil @@ -75,6 +75,9 @@ done %{python3_sitearch}/*.egg-info %changelog +* Thu Feb 22 2024 zhangliangpengkun - 5.4.3-14 +- Remove redundant patches + * Fri Jan 12 2024 zhangliangpengkun - 5.4.3-13 - #1216 - give credit to @hexaclock -- Gitee