1216 - give credit to @hexaclock

Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
This commit is contained in:
zhang-liang-pengkun 2024-01-12 17:52:17 +08:00
parent 7c336a95b7
commit d531246e47
2 changed files with 49 additions and 1 deletions

View File

@ -0,0 +1,44 @@
From 62e1783764420f36cd270135decb00b324add7fe Mon Sep 17 00:00:00 2001
From: Giampaolo Rodola <g.rodola@gmail.com>
Date: Tue, 13 Feb 2018 00:31:59 +0100
Subject: [PATCH] #1216 - give credit to @hexaclock
---
CREDITS | 4 ++++
HISTORY.rst | 9 +++++++++
2 files changed, 13 insertions(+)
diff --git a/CREDITS b/CREDITS
index cf9ce493..798b36e3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -515,3 +515,7 @@ I: 1167
N: janderbrain
W: https://github.com/janderbrain
I: 1169
+
+N: Dan Vinakovsky
+W: https://github.com/hexaclock
+I: 1216
diff --git a/HISTORY.rst b/HISTORY.rst
index dd813c5b..463860c2 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,14 @@
*Bug tracker at https://github.com/giampaolo/psutil/issues*
+5.4.4
+=====
+
+XXXX-XX-XX
+
+**Bug fixes**
+
+- 1216_: fix compatibility with python 2.6 on Windows (patch by Dan Vinakovsky)
+
5.4.3
=====
--
2.39.0.windows.2

View File

@ -1,6 +1,6 @@
Name: python-psutil
Version: 5.4.3
Release: 12
Release: 13
Summary: A library for retrieving information on running processes and system utilization in Python
License: BSD
URL: https://github.com/giampaolo/psutil
@ -11,6 +11,7 @@ Patch0002: CVE-2019-18874-2.patch
Patch0003: 0001-Fix-1354-Linux-disk_io_counters-fails-on-Linux-kerne.patch
Patch0004: 0002-Pass-python_requires-argument-to-setuptools-1208.patch
Patch0005: 0003-fix-compatibility-with-python-2.6.x-1216.patch
Patch0006: 0004-1216-give-credit-to-hexaclock.patch
BuildRequires: gcc python2-devel python3-devel procps-ng python2-mock python3-mock python2-ipaddress
@ -74,6 +75,9 @@ done
%{python3_sitearch}/*.egg-info
%changelog
* Fri Jan 12 2024 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 5.4.3-13
- #1216 - give credit to @hexaclock
* Wed Dec 27 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 5.4.3-12
- fix compatibility with python 2.6.x